]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
spns #33435: site-patch.py missing on native builds
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Mon, 23 Jan 2023 10:22:35 +0000 (11:22 +0100)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Mon, 23 Jan 2023 10:22:35 +0000 (11:22 +0100)
products/compil_scripts/openturns-1.19.sh
products/salome_system.pyconf

index bca4168cb45585966d06c233aa046526f12dd703..fdc7b80ab03553183375dd05aa6b12f75b555856 100755 (executable)
@@ -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
index 1406a45bf5b64c4ca89e377b23584506305023a6..069f7425d02f311e4948dca41507dbc1d7075b20 100644 (file)
@@ -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"]