bos #42837: handle Fedora 32 and 34, embed lapack for these two platforms

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index f4ecd864a345d7e6d786d17d7af0df5f6568c566..7e782f6ff914986d7965af629d78ec2147a17eb7 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -403,6 +403,7 @@ __overwrite__ :
         'APPLICATION.products.qwt'              : '6.1.6'
         'APPLICATION.products.PyQt'             : '5.15.3'
         'APPLICATION.products.sip'              : '5.5.0'
+        'APPLICATION.products.lapack'           : '3.8.0'
         'APPLICATION.products.PyFMI'            : {tag: '2.6',    base: 'no', section: 'version_2_6_no_pip'   }
         'APPLICATION.products.Sphinx'           : {tag: '1.7.6',  base: 'no', section: 'version_1_7_6_no_pip' }
         'APPLICATION.products.gdal'             : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'   } # spns #29324
@@ -419,6 +420,7 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['FD34']"
         'APPLICATION.rm_products'               : ['nose_py3','assimulo'] #
+        'APPLICATION.products.lapack'           : '3.8.0'
         'APPLICATION.products.opencv'           : '3.2.0'
         'APPLICATION.products.qwt'              : '6.1.6'
         'APPLICATION.products.omniORB'          : '4.2.5'

diff --git a/products/env_scripts/lapack.py b/products/env_scripts/lapack.py
index c15608ee926e3fc82f49f2ecf11a52c2eb95e55a..e8b1187dcd1356bedd16b073cf7f99e13ed7f6b6 100644 (file)
--- a/products/env_scripts/lapack.py
+++ b/products/env_scripts/lapack.py
@@ -17,19 +17,23 @@ def set_env(env, prereq_dir, version):
     env.set('BLAS', os.path.join(prereq_dir, 'lib'))
     env.set('LAPACK', os.path.join(prereq_dir, 'lib'))
     env.set('ATLAS', os.path.join(prereq_dir, 'lib'))
+    env.set('LAPACK_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapack-3.8.0'))
     env.set('LAPACKE_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapacke-3.8.0'))
     env.set('LAPACKE_INCDIR', os.path.join(prereq_dir,'include'))
     env.set('LAPACKE_LIBDIR', os.path.join(prereq_dir,'lib'))
+    env.set('CBLAS_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0'))
     env.set('CBLAS_ROOT_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0'))
   else:
     env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
     env.set('BLAS', os.path.join(prereq_dir, 'lib'))
     env.set('LAPACK', os.path.join(prereq_dir, 'lib'))
     env.set('ATLAS', os.path.join(prereq_dir, 'lib'))
+    env.set('LAPACK_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapack-3.8.0'))
     env.set('LAPACKE_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapacke-3.8.0'))
     env.set('LAPACKE_INCDIR', os.path.join(prereq_dir,'include'))
     env.set('LAPACKE_LIBDIR', os.path.join(prereq_dir,'lib'))
     env.set('CBLAS_ROOT_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0'))
+
 def set_nativ_env(env):
     env.set('LAPACKHOME', '/usr')
     env.set('LAPACK_ROOT_DIR', '/')