From ed51ac8c0c973e9b730b3462517c83d974b7184f Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 23 Jan 2023 11:22:35 +0100 Subject: [PATCH] spns #33435: site-patch.py missing on native builds --- products/compil_scripts/openturns-1.19.sh | 4 ++-- products/salome_system.pyconf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/products/compil_scripts/openturns-1.19.sh b/products/compil_scripts/openturns-1.19.sh index bca4168..fdc7b80 100755 --- a/products/compil_scripts/openturns-1.19.sh +++ b/products/compil_scripts/openturns-1.19.sh @@ -398,10 +398,10 @@ if [[ -d "$SOURCE_DIR/otfftw-0.12" ]]; then SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py ;; UB20*) - SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py + SITE_PATCH=/usr/lib/python3/dist-packages/setuptools/site-patch.py ;; FD32) - SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py + SITE_PATCH=/usr/lib/python3.8/site-packages/setuptools/site-patch.py ;; FD34) SITE_PATCH=$SOURCE_DIR/addons/site-patch.py diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf index 1406a45..069f742 100644 --- a/products/salome_system.pyconf +++ b/products/salome_system.pyconf @@ -88,7 +88,7 @@ default : { apt : ["libdc1394-25", "libopenexr25", "libwebp6", "libgfortran5", "libilmbase25", "libevent-2.1-7", "libpng16-16", "libgcc-10-dev", "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp24", - "openmpi-bin", "libnetcdf18", "libgdal28", "libtbb2"] + "openmpi-bin", "libnetcdf18", "libgdal28", "libtbb2", "pypy-setuptools"] apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev", "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libnetcdf-dev", "libgdal-dev", "texlive-latex-base", "texlive-latex-extra", "dvipng"] -- 2.39.2