From d9bbd1c2bad4b5fb91c0052980dad5290c5df0cb Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 7 Oct 2022 16:06:19 +0200 Subject: [PATCH] Fix EFICAS_TOOLS compilation issue on DB10 in case embedded PyQt/sip are in use --- products/EFICAS_TOOLS.pyconf | 2 +- products/compil_scripts/sip-5.5.0.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/products/EFICAS_TOOLS.pyconf b/products/EFICAS_TOOLS.pyconf index 4ce2231..b0483f2 100644 --- a/products/EFICAS_TOOLS.pyconf +++ b/products/EFICAS_TOOLS.pyconf @@ -13,7 +13,7 @@ default : { env_script : $name + ".py" } - depend : ['PyQt', 'Sphinx'] + depend : ['PyQt', 'Sphinx', 'sip'] build_depend : ["cmake"] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name diff --git a/products/compil_scripts/sip-5.5.0.sh b/products/compil_scripts/sip-5.5.0.sh index 60f829c..6f46bd1 100755 --- a/products/compil_scripts/sip-5.5.0.sh +++ b/products/compil_scripts/sip-5.5.0.sh @@ -58,5 +58,15 @@ cp *.h $PRODUCT_INSTALL/include cd $PRODUCT_INSTALL/bin ln -sf sip5 sip +LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" +case $LINUX_DISTRIBUTION in + DB10) + cd $PRODUCT_INSTALL/lib/python3.7/site-packages + ln -sf PyQt5_sip-12.8.1-py3.7-linux-x86_64.egg/PyQt5 + ;; + *) + ;; +esac + echo echo "########## END" -- 2.39.2