From b1efd15ddde2c9bb529aa5588c23cbc0e093f6df Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 12 Dec 2022 16:22:30 +0100 Subject: [PATCH] tbb system package is libtbb12 on UB22.04 \n Fix post_script script in case no directory or file matching regexp was found (add -r option) --- products/SALOME.pyconf | 1 + products/gmsh.pyconf | 1 + products/omniORB.pyconf | 1 + products/petsc.pyconf | 1 + products/post_scripts/fix_permissions.sh | 12 ++++++------ products/salome_system.pyconf | 18 +++++++++--------- products/tbb.pyconf | 7 ------- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/products/SALOME.pyconf b/products/SALOME.pyconf index e3c4098..e911b50 100644 --- a/products/SALOME.pyconf +++ b/products/SALOME.pyconf @@ -21,6 +21,7 @@ default : is_salome_application : "yes" incremental : "yes" } + post_script: "fix_permissions.sh" } default_win : diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf index 903dc7d..29a1712 100644 --- a/products/gmsh.pyconf +++ b/products/gmsh.pyconf @@ -18,6 +18,7 @@ default : { incremental : "yes" } + post_script: "fix_permissions.sh" } default_win: diff --git a/products/omniORB.pyconf b/products/omniORB.pyconf index 363becb..10cc1b3 100644 --- a/products/omniORB.pyconf +++ b/products/omniORB.pyconf @@ -17,6 +17,7 @@ default : incremental : "yes" } patches : [] + post_script: "fix_permissions.sh" } version_4_2_3_win_dbg: diff --git a/products/petsc.pyconf b/products/petsc.pyconf index bb9ebf4..d7da291 100644 --- a/products/petsc.pyconf +++ b/products/petsc.pyconf @@ -18,6 +18,7 @@ default : { incremental : "yes" } + post_script: "fix_permissions.sh" } version_3_17_0 : diff --git a/products/post_scripts/fix_permissions.sh b/products/post_scripts/fix_permissions.sh index 2bad9d5..be01943 100755 --- a/products/post_scripts/fix_permissions.sh +++ b/products/post_scripts/fix_permissions.sh @@ -2,9 +2,9 @@ echo "changing permissions..." cd $PRODUCT_INSTALL -find . -type d | xargs chmod ugo+rx -find . -name \*.py | xargs chmod ugo+r -find . -type f -perm 640 | xargs chmod ugo+r -find . -type d -perm 700 | xargs chmod ugo+rx -find . -type f -perm 700 | xargs chmod ugo+r -find . -type f -perm 750 | xargs chmod uo+rx +find . -type d | xargs -r chmod go+rx +find . -name \*.py | xargs -r chmod go+r +find . -type f -perm 640 | xargs -r chmod go+r +find . -type d -perm 700 | xargs -r chmod go+rx +find . -type f -perm 700 | xargs -r chmod go+r +find . -type f -perm 750 | xargs -r chmod go+rx diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf index a2f4331..1406a45 100644 --- a/products/salome_system.pyconf +++ b/products/salome_system.pyconf @@ -15,11 +15,11 @@ default : "libXi", "libXinerama", "libXmu", "libXpm", "libXrandr", "libXrender", "libXt", "libXtst", "lua", "mesa-libGLU", "ncurses-libs", "nspr", "nss", "nss-softokn-freebl", "nss-util", "openldap", "pango", "pcre", "pixman", "pulseaudio-libs", "pulseaudio-libs-glib2", "readline", "sqlite", "systemd-libs", "tbb", "xz-libs", - "zlib"] + "zlib", "tbb"] rpm_dev : ["openssl-devel", "tbb-devel", "gcc", "make", "sed", "gcc-c++", "expat-devel", "fontconfig-devel", "flex", "bison", "mesa-libGLU-devel", "libxcb-devel", "xcb-util-devel", "libxkbcommon-devel", "libxkbcommon-x11-devel", "bzip2-devel", "libXi-devel", "libXmu-devel", "automake", "libtool", "libjpeg-turbo-devel", "cmake", - "libXpm-devel", "libXft-devel", "sqlite-devel", "libcurl-devel", "libXt-devel", "libXcursor-devel"] + "libXpm-devel", "libXft-devel", "sqlite-devel", "libcurl-devel", "libXt-devel", "libXcursor-devel", "tbb-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", @@ -31,7 +31,7 @@ default : "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", "cmake", "libicu-dev", "libopenmpi-dev", "libreadline-dev", "libhwloc-dev", "libsqlite3-dev", "libcurl4-openssl-dev", - "libxt-dev", "libxcursor-dev"] + "libxt-dev", "libxcursor-dev", "libtbb-dev"] # specific to some platform(s) "CO7" : @@ -72,14 +72,14 @@ default : "DB09" : { apt : ["libdc1394-22", "libopenexr22", "libwebp6", "libgfortran3", "libilmbase12", "libevent-2.0-5", "libpng16-16", "libgcc-6-dev", - "libffi6", "libtinfo5", "libgphoto2-port12", "libglx0", "libopengl0", "libjsoncpp1"] + "libffi6", "libtinfo5", "libgphoto2-port12", "libglx0", "libopengl0", "libjsoncpp1", "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"] } "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", "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"] @@ -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"] + "openmpi-bin", "libnetcdf18", "libgdal28", "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"] @@ -102,14 +102,14 @@ default : "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", "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"] } "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", "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"] @@ -117,7 +117,7 @@ default : "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", "libtbb12"] 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"] diff --git a/products/tbb.pyconf b/products/tbb.pyconf index e7f3506..c78cd93 100644 --- a/products/tbb.pyconf +++ b/products/tbb.pyconf @@ -4,13 +4,6 @@ default : build_source : "script" compil_script : $name + $VARS.scriptExtension get_source : "archive" - system_info : - { - rpm : ["tbb"] - rpm_dev : ["tbb-devel"] - apt : ["libtbb2"] - apt_dev : ["libtbb-dev"] - } environ : { env_script : $name + ".py" -- 2.39.2