Merge pull request #111 from adaell/master

Updated flatpak files

Author: LutzGross

SConstruct

@@ -515,7 +515,7 @@ if not ( env['build_trilinos'] == "False" or env['build_trilinos'] == 'never' ):
             print("Building (no MPI) trilinos..............................")
             SH = "trilinos_nompi.sh"
     else:
-        shutil.copy(env['trilinos_make_sh'], env['trilinos_build'] + "hostmake.sh")
+        shutil.copy(env['trilinos_make_sh'], os.path.join(env['trilinos_build'],"hostmake.sh"))
         SH = "hostmake.sh"
     import subprocess
     p_init = subprocess.run(['sh', SH ] + SHARGS, capture_output=False, cwd =  env['trilinos_build'],  text=True)

scons/flatpak_options.py

@@ -21,41 +21,49 @@
 #cxx_extra = '-Wno-literal-suffix'
 openmp = True
 # mpi='OPENMPI'
-umfpack=True
-silo=True
-trilinos=True
 
 prefix='/app'
 
 import os
 import sys
 
-cxx_extra='-w -O3'
+cxx_extra='-w -O3 -march=native'
 
-pythoncmd='/app/bin/python3'
+#pythoncmd='/app/bin/python3'
 pythonlibpath = '/app/lib'
-pythonincpath = '/app/include/python3.7m'
+pythonincpath = '/usr/include/python3.12'
 
 boost_prefix=['/app/include','/app/lib']
+boost_libs = ['boost_python312','boost_iostreams','boost_random']
+domains=['finley','ripley','speckley']
 hdf5_prefix=['/app/include','/app/lib']
+hdf5_libs=['hdf5_cpp','hdf5','hdf5_hl_cpp']
 mpi_prefix=['/app/include','/app/lib']
 mpi_libs=['mpi_cxx']
-umfpack_prefix = ['/app/include','/app/lib']
-umfpack_libs = ['umfpack', 'blas', 'amd']
+lapack=0
 lapack_prefix = ['/app/include/', '/app/lib']
+ld_extra=''
+paso=1
+use_p4est=0
+silo=0
 silo_prefix = ['/app/include/', '/app/lib']
 silo_libs = ['silo','hdf5']
+trilinos=True
 trilinos_prefix = ['/app/include/', '/app/lib']
+trilinos_make_sh='tools/flatpak/flatpak_trilinos.sh'
+umfpack=False
+umfpack_prefix = ['/app/include','/app/lib']
+umfpack_libs = ['umfpack', 'blas', 'amd']
+visit=0
+werror=0
 
-dudley_assemble_flags = '-funroll-loops'
 
-p3name = ''
-for x in os.listdir("/app/lib"):
-  if x.startswith('libboost_python3') and x.endswith('.so'):
-    p3name=x
+
+dudley_assemble_flags = '-funroll-loops'
 
 # boost-python library/libraries to link against
-boost_libs = [p3name[3:-3]]
 
-# this can be used by options files importing us
-boost_py3_libs = [p3name[3:-3]]
+
+
+
+