From: Nicolas OTTON Date: Fri, 18 Nov 2022 14:28:29 +0000 (+0100) Subject: remove system_info from tbb and fftw product and put them in salome_system, update... X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=222a718856adc29435f6e417a7af5f53a2d8fab6;p=tools%2Fsat_salome.git remove system_info from tbb and fftw product and put them in salome_system, update to ub22 --- diff --git a/products/fftw.pyconf b/products/fftw.pyconf index 999b786..0dd6325 100644 --- a/products/fftw.pyconf +++ b/products/fftw.pyconf @@ -4,12 +4,8 @@ default : build_source : "script" compil_script : $name + $VARS.scriptExtension get_source : "archive" - system_info : + system_info : { - rpm : ["fftw"] - rpm_dev : ["fftw-devel"] - apt : ["fftw"] - apt_dev : ["fftw-dev"] } archive_info: { diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf index a2f4331..e77e937 100644 --- a/products/salome_system.pyconf +++ b/products/salome_system.pyconf @@ -22,11 +22,11 @@ default : "libXpm-devel", "libXft-devel", "sqlite-devel", "libcurl-devel", "libXt-devel", "libXcursor-devel"] apt : ["libbsd0", "libbz2-1.0", "libc6", "libdrm2", "libegl1", "libexif12", "libexpat1", "libfftw3-double3", "libfontconfig1", "libgl1", "libglu1-mesa", "libgomp1", "libgphoto2-6", "libice6", - "libjbig0", "libltdl7", "liblzma5", "libncurses5", "libnuma1", "libpcre3", "libquadmath0", + "libjbig0", "libltdl7", "liblzma5", "libnuma1", "libpcre3", "libquadmath0", "libraw1394-11", "libsm6", "libstdc++6", "libtiff5", "libudev1", "libusb-1.0-0", "libuuid1", "libx11-6", "libx11-xcb1", "libxau6", "libxcb1", "libxcb-glx0", "libxcb-xfixes0", "libxcb-xkb1", "libxdmcp6", "libxext6", "libxft2", "libxi6", "libxkbcommon0", "libxkbcommon-x11-0", "libxmu6", "libxpm4", "libxrender1", - "libxss1", "libxt6", "zlib1g", "libsqlite3"] + "libxss1", "libxt6", "zlib1g"] apt_dev : ["libssl-dev", "gcc", "make", "sed", "g++", "libexpat1-dev", "libfontconfig1-dev", "flex", "bison", "libglu1-mesa-dev", "perl", "libxcb-dri2-0-dev", "libxkbcommon-dev", "libxkbcommon-x11-dev", "bzip2", "libxi-dev", "libxt-dev", "libxmu-dev", "libxpm-dev", "libxft-dev", "automake", "libtool", "libjpeg-dev", @@ -36,13 +36,13 @@ default : # specific to some platform(s) "CO7" : { - rpm : ["lz4", "gsl", "libgeotiff", "giflib", "geos", "fftw"] - rpm_dev : ["perl", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel", "fftw-devel", "devtoolset-8-gcc", "texlive-dvipng"] + rpm : ["lz4", "gsl", "libgeotiff", "giflib", "geos", "fftw", "tbb"] + rpm_dev : ["perl", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel", "fftw-devel", "devtoolset-8-gcc", "texlive-dvipng", "fftw-devel", "tbb-devel"] } "CO8" : { - rpm : ["lz4", "openmpi", "gsl", "libgeotiff", "giflib", "geos", "sqlite", "netcdf"] - rpm_dev : ["perl-interpreter", "qt5-devel", "openmpi-devel", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel", "netcdf-devel", "texlive-dvipng"] + rpm : ["lz4", "openmpi", "gsl", "libgeotiff", "giflib", "geos", "sqlite", "netcdf", "fftw", "tbb"] + rpm_dev : ["perl-interpreter", "qt5-devel", "openmpi-devel", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel", "netcdf-devel", "texlive-dvipng", "fftw-devel", "tbb-devel"] } "FD30" : { @@ -51,76 +51,82 @@ default : } "FD32" : { - rpm : ["lz4", "gsl", "openmpi", "netcdf", "gdal"] - rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "protobuf-devel", "python3-protobuf", "texlive-dvipng"] + rpm : ["lz4", "gsl", "openmpi", "netcdf", "gdal", "fftw", "tbb"] + rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "protobuf-devel", "python3-protobuf", "texlive-dvipng", + "fftw-devel", "tbb-devel"] } "FD34" : { - rpm : ["lz4-libs", "gsl", "openmpi", "netcdf", "gdal"] - rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "gdal-devel", "texlive-dvipng"] + rpm : ["lz4-libs", "gsl", "openmpi", "netcdf", "gdal", "fftw", "tbb"] + rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "gdal-devel", "texlive-dvipng", "fftw-devel", "tbb-devel"] } "FD36" : { - rpm : ["lz4-libs", "gsl", "openmpi", "netcdf", "gdal"] - rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "gdal-devel"] + rpm : ["lz4-libs", "gsl", "openmpi", "netcdf", "gdal", "fftw", "tbb"] + rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "gdal-devel", "fftw-devel", "tbb-devel"] } "DB08" : { apt : ["libopenexr6", "libwebp5", "libgfortran3", "libilmbase6", "libevent-2.0-5", "libpng12-0", "libgcc-4.9-dev", - "libffi6", "libtinfo5", "libgphoto2-port10", "libjsoncpp1"] + "libffi6", "libtinfo5", "libgphoto2-port10", "libjsoncpp1", "libncurses5", "libsqlite3"] } "DB09" : { apt : ["libdc1394-22", "libopenexr22", "libwebp6", "libgfortran3", "libilmbase12", "libevent-2.0-5", "libpng16-16", "libgcc-6-dev", - "libffi6", "libtinfo5", "libgphoto2-port12", "libglx0", "libopengl0", "libjsoncpp1"] - apt_dev : ["libtbb-dev", "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "texlive-latex-base", "texlive-latex-extra", "dvipng"] + "libffi6", "libtinfo5", "libgphoto2-port12", "libglx0", "libopengl0", "libjsoncpp1", "libncurses5", "libsqlite3", "libfftw3-bin", "libtbb2"] + apt_dev : ["libtbb-dev", "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "texlive-latex-base", "texlive-latex-extra", "dvipng", "libfftw3-dev"] } "DB10" : { apt : ["libdc1394-22", "libopenexr23", "libwebp6", "libgfortran5", "libilmbase23", "libevent-2.1-6", "libpng16-16", "libgcc-8-dev", "libffi6", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp1", "libopenblas-base", "libscotch-6.0", "openmpi-bin", - "libnetcdf13", "libgdal20"] + "libnetcdf13", "libgdal20", "libncurses5", "libsqlite3", "fftw2", "libtbb2"] 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"] + "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", + "fftw-dev"] } "DB11" : { 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"] + "openmpi-bin", "libnetcdf18", "libgdal28", "libncurses5", "libsqlite3", fftw2", "libtbb2"] 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"] + "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", + "fftw-dev"] } "UB16.04" : { apt : ["libdc1394-22", "libopenexr22", "libwebp5", "libgfortran3", "libilmbase12", "libevent-2.0-5", "libpng12-0", "libgcc-5-dev", - "libffi6", "libtinfo5", "libgphoto2-port12"] + "libffi6", "libtinfo5", "libgphoto2-port12", "libncurses5", "libsqlite3"] apt_dev : ["libtbb-dev"] } "UB18.04" : { apt : ["libdc1394-22", "libopenexr22", "libwebp6", "libgfortran4", "libilmbase12", "libevent-2.1-6", "libpng16-16", "libgcc-7-dev", - "libffi6", "libtinfo5", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libopenblas-base", "libgeos-c1v5"] + "libffi6", "libtinfo5", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libopenblas-base", "libgeos-c1v5", + "libncurses5", "libfftw3-bin", "libtbb2"] apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", - "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "dvipng"] + "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "dvipng"] } "UB20.04" : { apt : ["libdc1394-22", "libopenexr24", "libwebp6", "libgfortran5", "libilmbase24", "libevent-2.1-7", "libpng16-16", "libgcc-9-dev", - "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "openmpi-bin", "libgdal26", "libopenblas0-serial"] + "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "openmpi-bin", "libgdal26", "libopenblas0-serial", + "libncurses5", "fftw2", "libtbb2"] 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", "libgdal-dev", "dvipng"] + "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libgdal-dev", "dvipng", "fftw-dev"] } "UB22.04" : { apt : ["libdc1394-25", "libopenexr25", "libwebp7", "gfortran-11", "libilmbase25", "libevent-2.1-7", "libpng16-16", "libgcc-11-dev", - "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "openmpi-bin", "libgdal30", "libopenblas0-serial"] + "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "openmpi-bin", "libgdal30", "libopenblas0-serial", + "libncurses6", "libsqlite3-0", fftw2", "libtbb2"] 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", "libgdal-dev", "dvipng"] + "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libgdal-dev", "dvipng", "fftw-dev"] } } diff --git a/products/tbb.pyconf b/products/tbb.pyconf index e7f3506..9770d91 100644 --- a/products/tbb.pyconf +++ b/products/tbb.pyconf @@ -4,12 +4,8 @@ default : build_source : "script" compil_script : $name + $VARS.scriptExtension get_source : "archive" - system_info : + system_info : { - rpm : ["tbb"] - rpm_dev : ["tbb-devel"] - apt : ["libtbb2"] - apt_dev : ["libtbb-dev"] } environ : {