From b9d662a5a0517ce370ab75f636af75653c0d1977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Thu, 29 May 2025 08:46:34 +0200 Subject: [PATCH] Package all libraries provided by Conan. --- pkg-scripts/make-deb-server | 8 ++++---- pkg-scripts/make-rpm-server | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkg-scripts/make-deb-server b/pkg-scripts/make-deb-server index 96b7c29cdd..8ad2b874d3 100755 --- a/pkg-scripts/make-deb-server +++ b/pkg-scripts/make-deb-server @@ -25,10 +25,10 @@ chrpath -d $DEB_BUILD_ROOT/* # TODO: get Qt from Conan if building without system Qt -# hack: we get libnode.so.108 from conan-libs folder, because the dpkg command at the end of this file cannot always find libnode -cp $OVERTE/build/conanlibs/Release/libnode.so.108 $DEB_BUILD_ROOT -# hack: we get libttb.so.12 from conan-libs folder, because the dpkg command at the end of this file cannot always find libtbb12 -cp $OVERTE/build/conanlibs/Release/libttb.so.12 $DEB_BUILD_ROOT +# Hack: Create libnode.so from libnode.so.108 +# We don't fail on error, in case libnode is provided by the system already. +ln -s $OVERTE/build/conanlibs/Release/libnode.so.* $OVERTE/build/conanlibs/Release/libnode.so || True +cp $OVERTE/build/conanlibs/Release/*.so $DEB_BUILD_ROOT strip --strip-all $DEB_BUILD_ROOT/* cp $OVERTE/pkg-scripts/new-server $DEB_BUILD_ROOT diff --git a/pkg-scripts/make-rpm-server b/pkg-scripts/make-rpm-server index 6ca8664b44..e0518f5b83 100755 --- a/pkg-scripts/make-rpm-server +++ b/pkg-scripts/make-rpm-server @@ -13,9 +13,12 @@ VERSION=${RPMVERSION//-} # TODO: Handle Qt built by Conan +# Hack: Create libnode.so from libnode.so.108 +# We don't fail on error, in case libnode is provided by the system already. +ln -s $OVERTE/build/conanlibs/Release/libnode.so.* $OVERTE/build/conanlibs/Release/libnode.so || True SOFILES=`ls \ $OVERTE/build/libraries/*/*.so \ - $OVERTE/build/conanlibs/Release/libnode.so* \ + $OVERTE/build/conanlibs/Release/*.so \ | sed 's/\./\\\./g' \ | paste -d'|' -s` @@ -24,8 +27,7 @@ DEPENDS=mesa-libGL,`ls \ $OVERTE/build/domain-server/domain-server \ $OVERTE/build/tools/oven/oven \ $OVERTE/build/libraries/*/*.so \ - $OVERTE/build/conanlibs/Release/libnode.so* \ - $OVERTE/build/conanlibs/Release/libtbb.so* \ + $OVERTE/build/conanlibs/Release/*.so \ $OVERTE/build/assignment-client/plugins/*.so \ $OVERTE/build/assignment-client/plugins/*/*.so \ | xargs -I {} sh -c 'objdump -p {} | grep NEEDED' \