summaryrefslogtreecommitdiffstats
path: root/dilos
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2022-07-25 14:58:52 +0200
committerSlávek Banko <slavek.banko@axis.cz>2022-07-25 14:58:52 +0200
commit07d71f5160936bb7a9aad3a0c81ccea715622dfc (patch)
tree9d6c6d508847a8fb008807497b5abdb84f650d15 /dilos
parent36932b47c3d0307bb1b140ed23d9697d5e3a5bad (diff)
downloadtde-packaging-07d71f5160936bb7a9aad3a0c81ccea715622dfc.tar.gz
tde-packaging-07d71f5160936bb7a9aad3a0c81ccea715622dfc.zip
DEB sip4-tqt: Fix installation of part for Python3.
+ Determine the default location of the include files for installing sip-tqt.h. + Add the forgotten python3-sip-tqt.install file file to install the library. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'dilos')
-rw-r--r--dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install1
-rwxr-xr-xdilos/dependencies/sip4-tqt/debian/rules21
2 files changed, 11 insertions, 11 deletions
diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install
new file mode 100644
index 000000000..5603520f7
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install
@@ -0,0 +1 @@
+usr/lib/python3.*/*-packages/sip_tqt.so
diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules
index a1e33636c..e4b27e000 100755
--- a/dilos/dependencies/sip4-tqt/debian/rules
+++ b/dilos/dependencies/sip4-tqt/debian/rules
@@ -63,7 +63,6 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* \
&& python$*-dbg ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*) \
- -e /usr/include/python$*_d \
-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
touch $@
@@ -128,11 +127,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/usr/include/python3.$*
- install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev/usr/include/python3.$*/
- mkdir -p debian/python3-sip-tqt-dev/usr/include/python3.$*_d
- ln -s ../python3.$*/sip-tqt.h \
- debian/python3-sip-tqt-dev/usr/include/python3.$*_d/sip-tqt.h
+ 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/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
@@ -143,11 +142,11 @@ install-arch-%:
install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
# install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
- mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
- install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev/usr/include/python$*/
- mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
- ln -s ../python$*/sip-tqt.h \
- debian/python-sip-tqt-dev/usr/include/python$*_d/sip-tqt.h
+ mkdir -p debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+ install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
+# mkdir -p debian/python-sip-tqt-dev$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+# ln -s ../$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \
+# debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h
mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)