diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-07-25 14:58:52 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-07-26 01:04:32 +0200 |
| commit | 7351ad64cba0e5a569199eab2149fea91a89a039 (patch) | |
| tree | 5ea763f4e89af09f09cb526d23c59b27a5c99834 /ubuntu | |
| parent | 3a1e2dc1bed1cd06f3d4fd80319d8c66bc2f313e (diff) | |
| download | tde-packaging-7351ad64cba0e5a569199eab2149fea91a89a039.tar.gz tde-packaging-7351ad64cba0e5a569199eab2149fea91a89a039.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>
(cherry picked from commit 07d71f5160936bb7a9aad3a0c81ccea715622dfc)
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install | 1 | ||||
| -rwxr-xr-x | ubuntu/_base/dependencies/sip4-tqt/debian/rules | 21 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install new file mode 100644 index 000000000..967fec5d9 --- /dev/null +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install @@ -0,0 +1 @@ +usr/lib/python3.*/*-packages/sip4_tqt/sip.so diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules index cfed03aff..8d082a92b 100755 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules @@ -61,7 +61,6 @@ dbg-build-%/configure-stamp: cd dbg-build-$* \ && python$*-dbg ../configure.py \ -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \ - -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 $@ @@ -125,11 +124,11 @@ install-arch-3.%: install -m 644 -o root -g root debian/sipconfig_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig.py install -m 644 -o root -g root build-3.$*/sipconfig.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig_nd.py install -m 644 -o root -g root dbg-build-3.$*/sipconfig.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig_d.py - mkdir -p debian/python3-sip-tqt-dev/usr/include/python3.$* - install -m 644 -o root -g root siplib/sip.h debian/python3-sip-tqt-dev/usr/include/python3.$*/ - mkdir -p debian/python3-sip-tqt-dev/usr/include/python3.$*_d - ln -s ../python3.$*/sip.h \ - debian/python3-sip-tqt-dev/usr/include/python3.$*_d/sip.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.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.h \ + debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip.h mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages/sip4_tqt install -m 644 -o root -g root sipdistutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages/sip4_tqt @@ -141,11 +140,11 @@ install-arch-%: install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/ install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py - mkdir -p debian/python-sip-tqt-dev/usr/include/python$* - install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/ - mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d - ln -s ../python$*/sip.h \ - debian/python-sip-tqt-dev/usr/include/python$*_d/sip.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.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.h \ + debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip.h mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt |