Updated the debian Sid options files

Author: adaell

scons/templates/sid_options.py

@@ -1,4 +1,3 @@
-
 ##############################################################################
 #
 # Copyright (c) 2003-2020 by The University of Queensland
@@ -18,65 +17,19 @@
 # This is a template configuration file for escript on Debian/GNU Linux.
 # Refer to README_FIRST for usage instructions.
 
+boost_libs=['boost_python311','boost_numpy311','boost_iostreams']
+cxx_extra=' -fdiagnostics-color=always -std=c++17 -Wno-mismatched-new-delete'
 escript_opts_version = 203
-#cxx_extra = '-Wno-literal-suffix'
+mumps=1
+mumps_prefix=['/usr/include','/usr/lib/x86_64-linux-gnu/']
+mumps_libs=['cmumps','dmumps','smumps','zmumps','mumps_common','pord']
+netcdf=4
 openmp = True
-#mpi = 'OPENMPI'
-
-import os
-
-d_mpi_path = '/usr/include/openmpi'
-mpi_prefix = os.path.split(os.path.realpath(d_mpi_path))[0]
-mpi_libs = ['mpi_cxx', 'mpi']
-netcdf = 4
-#umfpack = True
-umfpack_prefix = ['/usr/include/suitesparse', '/usr/lib']
-umfpack_libs = ['umfpack', 'blas', 'amd']
-lapack_prefix = ['/usr/include/atlas', '/usr/lib/atlas-base']
-#silo = True
-silo_libs = ['siloh5', 'hdf5_openmpi']
-dudley_assemble_flags = '-funroll-loops'
-
-
-import subprocess
-import os
-p = subprocess.Popen(["ld","--verbose"], stdout=subprocess.PIPE)
-out,err = p.communicate()
-spath = [x[13:-3] for x in out.split() if 'SEARCH_DIR' in x]
-p2name = ''
-p3name = ''
-for name in spath:
-  try:
-    l=os.listdir(name)
-    p2res=[x for x in l if (x.startswith('libboost_python-py2') or \
-            x.startswith('libboost_python2')) and x.endswith('.so')]
-    p3res=[x for x in l if (x.startswith('libboost_python-py3') or \
-            x.startswith('libboost_python3')) and x.endswith('.so')]
-    if len(p2name)==0 and len(p2res)>0:
-      p2name=p2res[-1]
-    if len(p3name)==0 and len(p3res)>0:
-      p3name=p3res[-1]
-  except OSError:
-    pass
-
-# boost-python library/libraries to link against
-boost_libs = [p2name[3:-3]]
-
-# this can be used by options files importing us
-boost_py2_libs = [p2name[3:-3]]
-boost_py3_libs = [p3name[3:-3]]
-
-from site_init import getdebbuildflags
-# Now we add the debian build flags
-debstuff = getdebbuildflags()
-if len(debstuff) > 0:
-  print("Building with the following additional flags from debian: "+str(debstuff))
-for i in debstuff:
-  k=i[0]
-  v=i[1]
-  try:
-    exec(k+"+=' "+v+"'")
-  except NameError:   
-    exec(k+"='"+v+"'")
-
-mathjax_path='/usr/share/javascript/mathjax/MathJax.js'
+pythonlibname=['python3.11']
+pythonincpath='/usr/include/python3.11/'
+umfpack=1
+umfpack_prefix=['/usr/include/suitesparse/','/usr/lib']
+silo=1
+silo_prefix=['/usr/include','/usr/lib/x86_64-linux-gnu/']
+silo_libs=['siloh5']
+verbose=1

scons/templates/sid_py3_options.py

@@ -20,7 +20,3 @@
 
 from scons.templates.sid_options import *
 
-pythoncmd = 'python3'
-
-boost_libs = boost_py3_libs
-