From 5251595bd615f911cddcfc028b2ce5badd098a4d Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 10 Oct 2024 21:04:46 +0200 Subject: [PATCH] spns #4320: fix installation issue about DB10 and UB22 --- applications/SALOME-master-native.pyconf | 2 +- products/compil_scripts/pyqwt-0.12.1.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 2f77cb3..ee44f30 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -297,7 +297,7 @@ __overwrite__ : # - Qt minimal version 5.12 # - xmlpatterns executable __condition__ : "VARS.dist in ['DB10']" - 'APPLICATION.rm_products' : ['nose_py3','assimulo'] + 'APPLICATION.rm_products' : ['nose_py3','assimulo', 'irmb', 'mcut'] 'APPLICATION.products.nlopt' : '2.4.2' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' diff --git a/products/compil_scripts/pyqwt-0.12.1.sh b/products/compil_scripts/pyqwt-0.12.1.sh index 180605d..b8bb44e 100755 --- a/products/compil_scripts/pyqwt-0.12.1.sh +++ b/products/compil_scripts/pyqwt-0.12.1.sh @@ -16,11 +16,21 @@ cd $BUILD_DIR export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH export PATH=${PRODUCT_INSTALL}/bin:$PATH -${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages +case $LINUX_DISTRIBUTION in + DB10|UB22*) + mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages + cp -r $SOURCE_DIR/qwt $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages/qwt + ;; + *) + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages + ;; +esac + if [ $? -ne 0 ]; then echo "ERROR: could not install" exit 1 fi + if [ -d ${PRODUCT_INSTALL}/lib64 ]; then mv ${PRODUCT_INSTALL}/lib64 ${PRODUCT_INSTALL}/lib fi -- 2.39.2