From a1ab29c2832d57b8640401f9c5ffafcd7a28fb62 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sat, 14 Feb 2026 19:23:14 +0100 Subject: DEB tdelibs: Update ls.so.conf according to multi-arch location. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of hard-coded lib64, which we never used, it makes sense to install the file in an architecture-dependent package and set the paths according to the multi-arch location of the specific architecture. Signed-off-by: Slávek Banko --- debian/_base/core/tdelibs/debian/rules | 12 +++++++++++- debian/_base/core/tdelibs/debian/trinitylibs.conf | 4 ++-- dilos/core/tdelibs/debian/rules | 12 +++++++++++- dilos/core/tdelibs/debian/trinitylibs.conf | 6 ++++-- ubuntu/_base/core/tdelibs/debian/rules | 12 +++++++++++- ubuntu/_base/core/tdelibs/debian/trinitylibs.conf | 4 ++-- 6 files changed, 41 insertions(+), 9 deletions(-) diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules index 6af9d17d2..a330c6d12 100755 --- a/debian/_base/core/tdelibs/debian/rules +++ b/debian/_base/core/tdelibs/debian/rules @@ -79,7 +79,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu - install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf # uudecode -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/abouttde.png debian/icons/abouttde-kubuntu.png.uu # uudecode -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/computer.png debian/icons/cr16-device-computer.png.uu @@ -102,6 +101,7 @@ binary-install/tdelibs-data-trinity:: ### +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) binary-predeb/tdelibs14-trinity-dev:: @@ -110,6 +110,16 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) endif binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity:: + # multi-arch in ld.so.conf + mkdir -p debian/tmp/etc/ld.so.conf.d +ifdef DEB_HOST_MULTIARCH + sed "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf +else + sed /\$$(DEB_HOST_MULTIARCH)/d debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf +endif + install -p -D -m644 debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf + + # tdecmshell wrapper mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell diff --git a/debian/_base/core/tdelibs/debian/trinitylibs.conf b/debian/_base/core/tdelibs/debian/trinitylibs.conf index 4158c0679..92d7cbf9e 100644 --- a/debian/_base/core/tdelibs/debian/trinitylibs.conf +++ b/debian/_base/core/tdelibs/debian/trinitylibs.conf @@ -1,4 +1,4 @@ +/opt/trinity/lib/$(DEB_HOST_MULTIARCH)/ +/opt/trinity/lib/$(DEB_HOST_MULTIARCH)/trinity/ /opt/trinity/lib/ -/opt/trinity/lib64/ /opt/trinity/lib/trinity/ -/opt/trinity/lib64/trinity/ diff --git a/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules index 24ec272a3..3191873e6 100755 --- a/dilos/core/tdelibs/debian/rules +++ b/dilos/core/tdelibs/debian/rules @@ -152,7 +152,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg \ binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/usr/etc/xdg/menus/tde-applications.menu -# install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf # uudecode -o debian/tdelibs-data-trinity/usr/share/apps/tdeui/pics/abouttde.png debian/icons/abouttde-kubuntu.png.uu # uudecode -o debian/tdelibs-data-trinity/usr/share/icons/crystalsvg/16x16/devices/computer.png debian/icons/cr16-device-computer.png.uu @@ -175,6 +174,7 @@ binary-install/tdelibs-data-trinity:: ### +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) binary-predeb/tdelibs14-trinity-dev:: @@ -183,6 +183,16 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) endif binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity:: +# # multi-arch in ld.so.conf +# mkdir -p debian/tmp/etc/ld.so.conf.d +#ifdef DEB_HOST_MULTIARCH +# sed "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf +#else +# sed /\$$(DEB_HOST_MULTIARCH)/d debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf +#endif +# install -p -D -m644 debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf + + # tdecmshell wrapper mv debian/tmp/usr/bin/tdecmshell debian/tmp/usr/bin/tdecmshell.real install -p -D -m755 debian/tmp/usr/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/tdecmshell.real install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/tdecmshell diff --git a/dilos/core/tdelibs/debian/trinitylibs.conf b/dilos/core/tdelibs/debian/trinitylibs.conf index 0997689c6..4b9c10605 100644 --- a/dilos/core/tdelibs/debian/trinitylibs.conf +++ b/dilos/core/tdelibs/debian/trinitylibs.conf @@ -1,2 +1,4 @@ -/usr/lib/64/ -/usr/lib/64/trinity/ +/usr/lib/$(DEB_HOST_MULTIARCH)/ +/usr/lib/$(DEB_HOST_MULTIARCH)/trinity/ +/usr/lib/ +/usr/lib/trinity/ diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index 8ac64a31b..1c97fa744 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -79,7 +79,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu - install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf # uudecode -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/abouttde.png debian/icons/abouttde-kubuntu.png.uu uudecode -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/computer.png debian/icons/cr16-device-computer.png.uu @@ -102,6 +101,7 @@ binary-install/tdelibs-data-trinity:: ### +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) binary-predeb/tdelibs14-trinity-dev:: @@ -110,6 +110,16 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) endif binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity:: + # multi-arch in ld.so.conf + mkdir -p debian/tmp/etc/ld.so.conf.d +ifdef DEB_HOST_MULTIARCH + sed "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf +else + sed /\$$(DEB_HOST_MULTIARCH)/d debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf +endif + install -p -D -m644 debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf + + # tdecmshell wrapper mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell diff --git a/ubuntu/_base/core/tdelibs/debian/trinitylibs.conf b/ubuntu/_base/core/tdelibs/debian/trinitylibs.conf index 4158c0679..92d7cbf9e 100644 --- a/ubuntu/_base/core/tdelibs/debian/trinitylibs.conf +++ b/ubuntu/_base/core/tdelibs/debian/trinitylibs.conf @@ -1,4 +1,4 @@ +/opt/trinity/lib/$(DEB_HOST_MULTIARCH)/ +/opt/trinity/lib/$(DEB_HOST_MULTIARCH)/trinity/ /opt/trinity/lib/ -/opt/trinity/lib64/ /opt/trinity/lib/trinity/ -/opt/trinity/lib64/trinity/ -- cgit v1.2.3