varied gcc compiler in makefile

2025-10-10 12:09:56 +02:00
parent 532abc7b1b
commit 3d955b1c98
9 changed files with 515 additions and 696 deletions
--- a/autogen_sfbd.sh
+++ b/autogen_sfbd.sh
@@ -3,9 +3,11 @@
 #<facility = sls sls2 sf>  default is sf
 #<target_language = cpp matlab python> 
 module unload gcc
-module load gcc/7.3.0 #7.5.0 for py38 py310 7.3.0 py37
-#module load gcc/10.4.0  ##rhel8
-#module load gcc/4.7.4 #for py35
+module load gcc/10.4.0  ##rhel8 - default 
+#Above overwritten for python in the below
+#module load gcc/7.3.0 for py35 py37
+#module load gcc/7.5.0 for py38 py310 
+
 ### psi specific - end

 rm -f configure.ac
@@ -224,37 +226,48 @@ then
    ENABLE_OPTIONS+=" --enable-python34"
    ENABLE_OPTIONS+=" --enable-qt4py34"
    CAFE_V+="-py34"
+    module unload
+    module load gcc/7.3.0
 elif [ "$CACLIENT" = "py35" ]
 then
    ENABLE_OPTIONS+=" --enable-python35"
    ENABLE_OPTIONS+=" --enable-qt4"
    CAFE_V+="-py35"
+    module unload
+    module load gcc/7.3.0
 elif  [ "$CACLIENT" = "py37" ]
 then
    ENABLE_OPTIONS+=" --enable-python37"
    ENABLE_OPTIONS+=" --enable-qt5"
-    CAFE_V+="-py37" 
+    CAFE_V+="-py37"
+    module unload
+    module load gcc/7.5.0
 elif  [ "$CACLIENT" = "py38" ]
 then
    ENABLE_OPTIONS+=" --enable-python38"
    ENABLE_OPTIONS+=" --enable-qt5py38"
    CAFE_V+="-py38"
+    module unload
+    module load gcc/7.5.0
 elif  [ "$CACLIENT" = "py39" ]
 then
    ENABLE_OPTIONS+=" --enable-python39"
    ENABLE_OPTIONS+=" --enable-qt5py39"
-    CAFE_V+="-py39" 
+    CAFE_V+="-py39"
+    module load gcc/7.5.0
 elif  [ "$CACLIENT" = "py310" ]
 then
    ENABLE_OPTIONS+=" --enable-python310"
    ENABLE_OPTIONS+=" --enable-qt5py310"
    CAFE_V+="-py310"
+    module unload
+    module load gcc/7.5.0
  
 elif  [ "$CACLIENT" = "cpp" ]
 then
    if [ "$FACILITY" != "hipa" ] 
    then
-	ENABLE_OPTIONS+=" --enable-qt5"
+	ENABLE_OPTIONS+=" --enable-qt5py310"
    fi
 fi

@@ -266,6 +279,8 @@ then
    ENABLE_OPTIONS+=" --enable-zeromq"
    ENABLE_OPTIONS+=" --enable-curl"
    ENABLE_OPTIONS+=" --enable-lz4"
+    module unload
+    module load gcc/7.3.0
 #else
    #rm -f src/PyCafe.cpp
    #ln -s PyCafe_sls.cpp src/PyCafe.cpp 
--- a/config.log
+++ b/config.log
--- a/config.status
+++ b/config.status
@@ -427,7 +427,7 @@ $config_commands

 Report bugs to <Bug reports to: jan.chrin@psi.ch>."

-ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-python35' '--enable-qt4' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1' '--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.9' 'CXX=/opt/psi/Programming/gcc/7.3.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.3.0/bin/gcc'"
+ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1' '--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.9' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc'"
 ac_cs_version="\
 CAFE config.status 1.22.0
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -439,8 +439,8 @@ gives unlimited permission to copy, distribute and modify it."

 ac_pwd='/afs/psi.ch/project/cafe/gitea/CAFE/cpp'
 srcdir='.'
-INSTALL='/usr/bin/install -c'
-MKDIR_P='/usr/bin/mkdir -p'
+INSTALL='/bin/install -c'
+MKDIR_P='/bin/mkdir -p'
 AWK='gawk'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -519,7 +519,7 @@ if $ac_cs_silent; then
 fi

 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-python35' '--enable-qt4' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1' '--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.9' 'CXX=/opt/psi/Programming/gcc/7.3.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.3.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  '--prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1' '--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.9' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion
  shift
  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
  CONFIG_SHELL='/bin/sh'
@@ -565,13 +565,13 @@ host_os='linux-gnu'
 build_alias=''
 build='x86_64-pc-linux-gnu'
 build_os='linux-gnu'
-SED='/usr/bin/sed'
-Xsed='/usr/bin/sed -e 1s/^X//'
-GREP='/usr/bin/grep'
-EGREP='/usr/bin/grep -E'
-FGREP='/usr/bin/grep -F'
-LD='/usr/bin/ld -m elf_x86_64'
-NM='/usr/bin/nm -B'
+SED='/bin/sed'
+Xsed='/bin/sed -e 1s/^X//'
+GREP='/bin/grep'
+EGREP='/bin/grep -E'
+FGREP='/bin/grep -F'
+LD='/bin/ld -m elf_x86_64'
+NM='/bin/nm -B'
 LN_S='ln -s'
 max_cmd_len='1572864'
 ac_objext='o'
@@ -599,9 +599,9 @@ old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $tool_oldlib'
 old_postuninstall_cmds=''
 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
 lock_old_archive_extraction='no'
-CC='/opt/psi/Programming/gcc/7.3.0/bin/gcc'
+CC='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
 CFLAGS='-g -O2'
-compiler='/opt/psi/Programming/gcc/7.3.0/bin/g++'
+compiler='/opt/psi/Programming/gcc/10.4.0/bin/g++'
 GCC='yes'
 lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''
 lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
@@ -611,7 +611,7 @@ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \(.*\)
 lt_cv_nm_interface='BSD nm'
 nm_file_list_spec='@'
 lt_sysroot=''
-lt_cv_truncate_bin='/usr/bin/dd bs=4096 count=1'
+lt_cv_truncate_bin='/bin/dd bs=4096 count=1'
 objdir='.libs'
 MAGIC_CMD='file'
 lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -678,8 +678,8 @@ postuninstall_cmds=''
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 finish_eval=''
 hardcode_into_libs='yes'
-sys_lib_search_path_spec='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc /opt/psi/Programming/gcc/7.3.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.3.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib /lib /usr/lib '
-configure_time_dlsearch_path='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst           /usr/lib64/iscsi /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 '
+sys_lib_search_path_spec='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib /lib /usr/lib '
+configure_time_dlsearch_path='/lib /usr/lib /usr/lib64/atlas                /usr/lib64/llvm17/lib/ /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ '
 configure_time_lt_sys_library_path=''
 hardcode_action='immediate'
 enable_dlopen='unknown'
@@ -693,11 +693,11 @@ postdep_objects=''
 predeps=''
 postdeps=''
 compiler_lib_search_path=''
-LD_CXX='/usr/bin/ld -m elf_x86_64'
+LD_CXX='/bin/ld -m elf_x86_64'
 reload_flag_CXX=' -r'
 reload_cmds_CXX='$LD$reload_flag -o $output$reload_objs'
 old_archive_cmds_CXX='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
-compiler_CXX='/opt/psi/Programming/gcc/7.3.0/bin/g++'
+compiler_CXX='/opt/psi/Programming/gcc/10.4.0/bin/g++'
 GCC_CXX='yes'
 lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
 lt_prog_compiler_pic_CXX=' -fPIC -DPIC'
@@ -735,16 +735,16 @@ prelink_cmds_CXX=''
 postlink_cmds_CXX=''
 file_list_spec_CXX=''
 hardcode_action_CXX='immediate'
-compiler_lib_search_dirs_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.3.0/lib64/../lib64 /opt/psi/Programming/gcc/7.3.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.3.0/lib64 /opt/psi/Programming/gcc/7.3.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../..'
-predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/crtbeginS.o'
-postdep_objects_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/crtendS.o /lib/../lib64/crtn.o'
+compiler_lib_search_dirs_CXX='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64/../lib64 /opt/psi/Programming/gcc/10.4.0/lib/../lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/10.4.0/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../..'
+predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o'
+postdep_objects_CXX='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtendS.o /lib/../lib64/crtn.o'
 predeps_CXX=''
 postdeps_CXX='-lstdc++ -lm -lgcc_s -lc -lgcc_s'
-compiler_lib_search_path_CXX='-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.3.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.3.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.3.0/lib64 -L/opt/psi/Programming/gcc/7.3.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../..'
+compiler_lib_search_path_CXX='-L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/10.4.0/lib64/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib/../lib64 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib64 -L/opt/psi/Programming/gcc/10.4.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../..'

-LTCC='/opt/psi/Programming/gcc/7.3.0/bin/gcc'
+LTCC='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
 LTCFLAGS='-g -O2'
-compiler='/opt/psi/Programming/gcc/7.3.0/bin/gcc'
+compiler='/opt/psi/Programming/gcc/10.4.0/bin/gcc'

 # A function that is used when there is no print builtin or printf.
 func_fallback_echo ()
@@ -879,19 +879,16 @@ S["LTLIBOBJS"]=""
 S["LIBOBJS"]=""
 S["HAVE_ZEROMQ__FALSE"]=""
 S["HAVE_ZEROMQ__TRUE"]="#"
-S["HAVE_PYCAFE_EXT__FALSE"]="#"
-S["HAVE_PYCAFE_EXT__TRUE"]=""
-S["HAVE_PYTHON__FALSE"]="#"
-S["HAVE_PYTHON__TRUE"]=""
-S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -L/opt/gfa/python-3.5/latest/lib  -Wl,-rpath"\
-",/opt/gfa/python-3.5/latest/lib -L/opt/gfa/python-3.5/latest/lib   -Wl,-rpath,/opt/gfa/python-3.5/latest/lib "
+S["HAVE_PYCAFE_EXT__FALSE"]=""
+S["HAVE_PYCAFE_EXT__TRUE"]="#"
+S["HAVE_PYTHON__FALSE"]=""
+S["HAVE_PYTHON__TRUE"]="#"
+S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64"
 S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/ba"\
-"se-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.5/late"\
-"st/include/python3.5m -I/opt/gfa/python-3.5/latest/lib/python3.5/site-packages/numpy/core/include  -I/opt/gfa/python-3.5/latest/include  -I/opt/gfa/"\
-"python-3.5/latest/include/QtCore  -I/opt/gfa/python-3.5/latest/include/QtXml"
+"se-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include"
 S["CAFE_CPPFLAGS"]="-I$(top_srcdir)/include "
-S["CXXCPP"]="/opt/psi/Programming/gcc/7.3.0/bin/g++ -E"
-S["CPP"]="/opt/psi/Programming/gcc/7.3.0/bin/gcc -E"
+S["CXXCPP"]="/opt/psi/Programming/gcc/10.4.0/bin/g++ -E"
+S["CPP"]="/opt/psi/Programming/gcc/10.4.0/bin/gcc -E"
 S["LT_SYS_LIBRARY_PATH"]=""
 S["OTOOL64"]=""
 S["OTOOL"]=""
@@ -905,20 +902,20 @@ S["AR"]="ar"
 S["DLLTOOL"]="false"
 S["OBJDUMP"]="objdump"
 S["LN_S"]="ln -s"
-S["NM"]="/usr/bin/nm -B"
+S["NM"]="/bin/nm -B"
 S["ac_ct_DUMPBIN"]=""
 S["DUMPBIN"]=""
-S["LD"]="/usr/bin/ld -m elf_x86_64"
-S["FGREP"]="/usr/bin/grep -F"
-S["EGREP"]="/usr/bin/grep -E"
-S["GREP"]="/usr/bin/grep"
-S["SED"]="/usr/bin/sed"
+S["LD"]="/bin/ld -m elf_x86_64"
+S["FGREP"]="/bin/grep -F"
+S["EGREP"]="/bin/grep -E"
+S["GREP"]="/bin/grep"
+S["SED"]="/bin/sed"
 S["am__fastdepCC_FALSE"]="#"
 S["am__fastdepCC_TRUE"]=""
 S["CCDEPMODE"]="depmode=gcc3"
-S["ac_ct_CC"]="/opt/psi/Programming/gcc/7.3.0/bin/gcc"
+S["ac_ct_CC"]="/opt/psi/Programming/gcc/10.4.0/bin/gcc"
 S["CFLAGS"]="-g -O2"
-S["CC"]="/opt/psi/Programming/gcc/7.3.0/bin/gcc"
+S["CC"]="/opt/psi/Programming/gcc/10.4.0/bin/gcc"
 S["host_os"]="linux-gnu"
 S["host_vendor"]="pc"
 S["host_cpu"]="x86_64"
@@ -941,13 +938,10 @@ S["OBJEXT"]="o"
 S["EXEEXT"]=""
 S["ac_ct_CXX"]=""
 S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/ba"\
-"se-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.5/late"\
-"st/include/python3.5m -I/opt/gfa/python-3.5/latest/lib/python3.5/site-packages/numpy/core/include  -I/opt/gfa/python-3.5/latest/include  -I/opt/gfa/"\
-"python-3.5/latest/include/QtCore  -I/opt/gfa/python-3.5/latest/include/QtXml"
-S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -L/opt/gfa/python-3.5/latest/lib  -Wl,-rpath"\
-",/opt/gfa/python-3.5/latest/lib -L/opt/gfa/python-3.5/latest/lib   -Wl,-rpath,/opt/gfa/python-3.5/latest/lib "
+"se-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include"
+S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64"
 S["CXXFLAGS"]="-g -O2"
-S["CXX"]="/opt/psi/Programming/gcc/7.3.0/bin/g++"
+S["CXX"]="/opt/psi/Programming/gcc/10.4.0/bin/g++"
 S["AM_BACKSLASH"]="\\"
 S["AM_DEFAULT_VERBOSITY"]="1"
 S["AM_DEFAULT_V"]="$(AM_DEFAULT_VERBOSITY)"
@@ -959,7 +953,7 @@ S["am__leading_dot"]="."
 S["SET_MAKE"]=""
 S["AWK"]="gawk"
 S["mkdir_p"]="$(MKDIR_P)"
-S["MKDIR_P"]="/usr/bin/mkdir -p"
+S["MKDIR_P"]="/bin/mkdir -p"
 S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
 S["STRIP"]="strip"
 S["install_sh"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh"
@@ -978,14 +972,14 @@ S["INSTALL_PROGRAM"]="${INSTALL}"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
-S["LIBS"]="-lQtXml -lQtCore -lpython3.5m "
+S["LIBS"]=""
 S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DHAVE_CONFIG_H"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
-S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0/lib/RHEL8-x86_64"
+S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64"
 S["psdir"]="${docdir}"
 S["pdfdir"]="${docdir}"
 S["dvidir"]="${docdir}"
@@ -1003,7 +997,7 @@ S["libexecdir"]="${exec_prefix}/libexec"
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"
-S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0"
+S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0"
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_URL"]=""
 S["PACKAGE_BUGREPORT"]="Bug reports to: jan.chrin@psi.ch"
@@ -1076,22 +1070,14 @@ D["HAVE_UNISTD_H"]=" 1"
 D["HAVE_DLFCN_H"]=" 1"
 D["LT_OBJDIR"]=" \".libs/\""
 D["HAVE_LINUX"]=" 1"
+D["HAVE_CADEF_H"]=" 1"
+D["HAVE_EPICSTYPES_H"]=" 1"
 D["HAVE_EPICS"]=" 7.0.9"
 D["EPICS_MAJOR"]=" 7"
 D["EPICS_MINOR"]=" 0"
 D["EPICS_PATCH"]=" 9"
 D["HAVE_MULTI_INDEX_CONTAINER_HPP"]=" 1"
 D["HAVE_BOOST"]=" 1"
-D["HAVE_PYTHON_H"]=" 1"
-D["HAVE_LIBPYTHON3_5M"]=" 1"
-D["HAVE_PYTHON"]=" 1"
-D["HAVE_PYCAFE_EXT"]=" 1"
-D["HAVE_QXML_H"]=" 1"
-D["HAVE_LIBQTCORE"]=" 1"
-D["HAVE_LIBQTXML"]=" 1"
-D["HAVE_QT"]=" 1"
-D["HAVE_LIBQTXML"]=" 1"
-D["QT_NO_VERSION_TAGGING"]=" 1"
  for (key in D) D_is_set[key] = 1
  FS = ""
 }
--- a/include/config.h
+++ b/include/config.h
@@ -17,7 +17,7 @@
 /* #undef HAVE_BOOST_THREAD */

 /* Define to 1 if you have the <cadef.h> header file. */
-/* #undef HAVE_CADEF_H */
+#define HAVE_CADEF_H 1

 /* Availability of curl */
 /* #undef HAVE_CURL */
@@ -32,7 +32,7 @@
 #define HAVE_EPICS 7.0.9

 /* Define to 1 if you have the <epicsTypes.h> header file. */
-/* #undef HAVE_EPICSTYPES_H */
+#define HAVE_EPICSTYPES_H 1

 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
@@ -63,7 +63,7 @@
 /* #undef HAVE_LIBPYTHON3_4M */

 /* Define to 1 if you have the `python3.5m' library (-lpython3.5m). */
-#define HAVE_LIBPYTHON3_5M 1
+/* #undef HAVE_LIBPYTHON3_5M */

 /* Define to 1 if you have the `python3.7m' library (-lpython3.7m). */
 /* #undef HAVE_LIBPYTHON3_7M */
@@ -78,10 +78,10 @@
 /* #undef HAVE_LIBQT5XML */

 /* Define to 1 if you have the `QtCore' library (-lQtCore). */
-#define HAVE_LIBQTCORE 1
+/* #undef HAVE_LIBQTCORE */

 /* Availability of Qt version 5 confirmed */
-#define HAVE_LIBQTXML 1
+/* #undef HAVE_LIBQTXML */

 /* Define to 1 if you have the `zmq' library (-lzmq). */
 /* #undef HAVE_LIBZMQ */
@@ -102,19 +102,19 @@
 #define HAVE_MULTI_INDEX_CONTAINER_HPP 1

 /* pycafe extern C */
-#define HAVE_PYCAFE_EXT 1
+/* #undef HAVE_PYCAFE_EXT */

 /* Availability of python */
-#define HAVE_PYTHON 1
+/* #undef HAVE_PYTHON */

 /* Define to 1 if you have the <Python.h> header file. */
-#define HAVE_PYTHON_H 1
+/* #undef HAVE_PYTHON_H */

 /* Availability of Qt version 5 confirmed */
-#define HAVE_QT 1
+/* #undef HAVE_QT */

 /* Define to 1 if you have the <qxml.h> header file. */
-#define HAVE_QXML_H 1
+/* #undef HAVE_QXML_H */

 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -168,7 +168,7 @@
 #define PACKAGE_VERSION "1.22.0"

 /* Availability of Qt version 5 confirmed */
-#define QT_NO_VERSION_TAGGING 1
+/* #undef QT_NO_VERSION_TAGGING */

 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
--- a/include/makefile
+++ b/include/makefile
@@ -96,8 +96,8 @@ host_triplet = x86_64-pc-linux-gnu
 #if HAVE_PYTHON_
 #include_HEADERS += PyCafe_api.h
 #endif
-am__append_2 = PyCafe.h 
-#am__append_3 = PyCafe_api.h
+#am__append_2 = PyCafe.h 
+am__append_3 = PyCafe_api.h
 subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -199,22 +199,22 @@ am__DIST_COMMON = $(srcdir)/makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
 AMTAR = $${TAR-tar}
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.5/latest/include/python3.5m -I/opt/gfa/python-3.5/latest/lib/python3.5/site-packages/numpy/core/include  -I/opt/gfa/python-3.5/latest/include  -I/opt/gfa/python-3.5/latest/include/QtCore  -I/opt/gfa/python-3.5/latest/include/QtXml
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -L/opt/gfa/python-3.5/latest/lib  -Wl,-rpath,/opt/gfa/python-3.5/latest/lib -L/opt/gfa/python-3.5/latest/lib   -Wl,-rpath,/opt/gfa/python-3.5/latest/lib 
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
-CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
-CPP = /opt/psi/Programming/gcc/7.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.5/latest/include/python3.5m -I/opt/gfa/python-3.5/latest/lib/python3.5/site-packages/numpy/core/include  -I/opt/gfa/python-3.5/latest/include  -I/opt/gfa/python-3.5/latest/include/QtCore  -I/opt/gfa/python-3.5/latest/include/QtXml
-CXX = /opt/psi/Programming/gcc/7.3.0/bin/g++
-CXXCPP = /opt/psi/Programming/gcc/7.3.0/bin/g++ -E
+CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
+CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
+CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
 CXXFLAGS = -g -O2
 CYGPATH_W = echo
@@ -226,19 +226,19 @@ DUMPBIN =
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
-FGREP = /usr/bin/grep -F
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
+FGREP = /bin/grep -F
+GREP = /bin/grep
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -L/opt/gfa/python-3.5/latest/lib  -Wl,-rpath,/opt/gfa/python-3.5/latest/lib -L/opt/gfa/python-3.5/latest/lib   -Wl,-rpath,/opt/gfa/python-3.5/latest/lib 
+LD = /bin/ld -m elf_x86_64
+LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQtXml -lQtCore -lpython3.5m 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -246,8 +246,8 @@ LTLIBOBJS =
 LT_SYS_LIBRARY_PATH = 
 MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
+MKDIR_P = /bin/mkdir -p
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -262,7 +262,7 @@ PACKAGE_URL =
 PACKAGE_VERSION = 1.22.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
@@ -272,7 +272,7 @@ abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/include
 abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 ac_ct_AR = ar
-ac_ct_CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 ac_ct_CXX = 
 ac_ct_DUMPBIN = 
 am__include = include
@@ -301,7 +301,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -309,7 +309,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
--- a/67
+++ b/67
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Generated automatically by config.status (cafe) 1.22.0
-# Libtool was configured on host pc13470.psi.ch:
+# Libtool was configured on host sls-lc8.psi.ch:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

 # Provide generalized library-building support services.
@@ -76,22 +76,22 @@ build=x86_64-pc-linux-gnu
 build_os=linux-gnu

 # A sed program that does not truncate output.
-SED="/usr/bin/sed"
+SED="/bin/sed"

 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="$SED -e 1s/^X//"

 # A grep program that handles long lines.
-GREP="/usr/bin/grep"
+GREP="/bin/grep"

 # An ERE matcher.
-EGREP="/usr/bin/grep -E"
+EGREP="/bin/grep -E"

 # A literal string matcher.
-FGREP="/usr/bin/grep -F"
+FGREP="/bin/grep -F"

 # A BSD- or MS-compatible name lister.
-NM="/usr/bin/nm -B"
+NM="/bin/nm -B"

 # Whether we need soft or hard links.
 LN_S="ln -s"
@@ -162,7 +162,7 @@ old_postuninstall_cmds=""
 lock_old_archive_extraction=no

 # A C compiler.
-LTCC="/opt/psi/Programming/gcc/7.3.0/bin/gcc"
+LTCC="/opt/psi/Programming/gcc/10.4.0/bin/gcc"

 # LTCC compiler flags.
 LTCFLAGS="-g -O2"
@@ -192,7 +192,7 @@ nm_file_list_spec="@"
 lt_sysroot=

 # Command to truncate a binary pipe.
-lt_truncate_bin="/usr/bin/dd bs=4096 count=1"
+lt_truncate_bin="/bin/dd bs=4096 count=1"

 # The name of the directory that contains temporary libtool files.
 objdir=.libs
@@ -282,10 +282,10 @@ finish_eval=""
 hardcode_into_libs=yes

 # Compile-time system search path for libraries.
-sys_lib_search_path_spec="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc /opt/psi/Programming/gcc/7.3.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.3.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib /lib /usr/lib "
+sys_lib_search_path_spec="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib /lib /usr/lib "

 # Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst           /usr/lib64/iscsi /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib64/atlas                /usr/lib64/llvm17/lib/ /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ "

 # Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
 configure_time_lt_sys_library_path=""
@@ -305,7 +305,7 @@ striplib="strip --strip-unneeded"


 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/bin/ld -m elf_x86_64"

 # How to create reloadable object files.
 reload_flag=" -r"
@@ -315,7 +315,7 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"

 # A language specific compiler.
-CC="/opt/psi/Programming/gcc/7.3.0/bin/gcc"
+CC="/opt/psi/Programming/gcc/10.4.0/bin/gcc"

 # Is the compiler the GNU compiler?
 with_gcc=yes
@@ -7732,6 +7732,11 @@ func_mode_link ()
 	arg=$func_stripname_result
 	;;

+      -Wl,--as-needed)
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
      -Wl,*)
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
@@ -7784,12 +7789,10 @@ func_mode_link ()
      # -tp=*                Portland pgcc target processor selection
      # --sysroot=*          for sysroot support
      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      # -specs=*             GCC specs files
      # -stdlib=*            select c++ std lib with clang
      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-      -specs=*)
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
        func_quote_for_eval "$arg"
 	arg=$func_quote_for_eval_result
        func_append compile_command " $arg"
@@ -8038,6 +8041,7 @@ func_mode_link ()

    case $linkmode in
    lib)
+	as_needed_flag=
 	passes="conv dlpreopen link"
 	for file in $dlfiles $dlprefiles; do
 	  case $file in
@@ -8049,6 +8053,7 @@ func_mode_link ()
 	done
 	;;
    prog)
+	as_needed_flag=
 	compile_deplibs=
 	finalize_deplibs=
 	alldeplibs=false
@@ -8118,6 +8123,15 @@ func_mode_link ()
 	lib=
 	found=false
 	case $deplib in
+	-Wl,--as-needed)
+	  if test prog,link = "$linkmode,$pass" ||
+	     test lib,link = "$linkmode,$pass"; then
+	    as_needed_flag="$deplib "
+	  else
+	    deplibs="$deplib $deplibs"
+	  fi
+	  continue
+	  ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test prog,link = "$linkmode,$pass"; then
@@ -10535,6 +10549,13 @@ EOF
 	  test "X$libobjs" = "X " && libobjs=
 	fi

+	# A bit hacky. I had wanted to add \$as_needed_flag to archive_cmds instead, but that
+	# comes from libtool.m4 which is part of the project being built. This should put it
+	# in the right place though.
+	if test lib,link = "$linkmode,$pass" && test -n "$as_needed_flag"; then
+	  libobjs=$as_needed_flag$libobjs
+	fi
+
 	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
 	  IFS=$sp$nl
@@ -10767,8 +10788,8 @@ EOF
      compile_deplibs=$new_libs


-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
+      func_append compile_command " $as_needed_flag $compile_deplibs"
+      func_append finalize_command " $as_needed_flag $finalize_deplibs"

      if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -11663,7 +11684,7 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # ### BEGIN LIBTOOL TAG CONFIG: CXX

 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/bin/ld -m elf_x86_64"

 # How to create reloadable object files.
 reload_flag=" -r"
@@ -11673,7 +11694,7 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"

 # A language specific compiler.
-CC="/opt/psi/Programming/gcc/7.3.0/bin/g++"
+CC="/opt/psi/Programming/gcc/10.4.0/bin/g++"

 # Is the compiler the GNU compiler?
 with_gcc=yes
@@ -11794,17 +11815,17 @@ file_list_spec=""
 hardcode_action=immediate

 # The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.3.0/lib64/../lib64 /opt/psi/Programming/gcc/7.3.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.3.0/lib64 /opt/psi/Programming/gcc/7.3.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../.."
+compiler_lib_search_dirs="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64/../lib64 /opt/psi/Programming/gcc/10.4.0/lib/../lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/10.4.0/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../.."

 # Dependencies to place before and after the objects being linked to
 # create a shared library.
-predep_objects="/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/crtbeginS.o"
-postdep_objects="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/crtendS.o /lib/../lib64/crtn.o"
+predep_objects="/lib/../lib64/crti.o /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o"
+postdep_objects="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtendS.o /lib/../lib64/crtn.o"
 predeps=""
 postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"

 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.3.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.3.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.3.0/lib64 -L/opt/psi/Programming/gcc/7.3.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../.."
+compiler_lib_search_path="-L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/10.4.0/lib64/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib/../lib64 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib64 -L/opt/psi/Programming/gcc/10.4.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../.."

 # ### END LIBTOOL TAG CONFIG: CXX
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2867,9 +2867,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
  # before this can be enabled.
  hardcode_into_libs=yes

-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
  # Ideally, we could use ldconfig to report *all* directores which are
  # searched for libraries, however this is still not possible.  Aside from not
  # being certain /sbin/ldconfig is available, command
@@ -2878,7 +2875,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
  # appending ld.so.conf contents (and includes) to the search path.
  if test -f /etc/ld.so.conf; then
    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
  fi

  # We used to test for /lib/ld.so.1 and disable shared libraries on
--- a/48
+++ b/48
@@ -194,10 +194,10 @@ am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/./compile \
 	$(top_srcdir)/./include/config.in $(top_srcdir)/./install-sh \
 	$(top_srcdir)/./ltmain.sh $(top_srcdir)/./missing .//AUTHORS \
 	.//COPYING .//ChangeLog .//INSTALL .//NEWS .//README \
-	.//compile .//config.guess .//config.sub .//install-sh \
-	.//ltmain.sh .//missing AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README compile config.guess config.sub install-sh ltmain.sh \
-	missing
+	.//compile .//config.guess .//config.sub .//depcomp \
+	.//install-sh .//ltmain.sh .//missing AUTHORS COPYING \
+	ChangeLog INSTALL NEWS README compile config.guess config.sub \
+	depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -242,22 +242,22 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
 AMTAR = $${TAR-tar}
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.5/latest/include/python3.5m -I/opt/gfa/python-3.5/latest/lib/python3.5/site-packages/numpy/core/include  -I/opt/gfa/python-3.5/latest/include  -I/opt/gfa/python-3.5/latest/include/QtCore  -I/opt/gfa/python-3.5/latest/include/QtXml -I$(top_srcdir)/include 
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I$(top_srcdir)/include 
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -L/opt/gfa/python-3.5/latest/lib  -Wl,-rpath,/opt/gfa/python-3.5/latest/lib -L/opt/gfa/python-3.5/latest/lib   -Wl,-rpath,/opt/gfa/python-3.5/latest/lib  @CAFE_LIBS@
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 @CAFE_LIBS@
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
-CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
-CPP = /opt/psi/Programming/gcc/7.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.5/latest/include/python3.5m -I/opt/gfa/python-3.5/latest/lib/python3.5/site-packages/numpy/core/include  -I/opt/gfa/python-3.5/latest/include  -I/opt/gfa/python-3.5/latest/include/QtCore  -I/opt/gfa/python-3.5/latest/include/QtXml
-CXX = /opt/psi/Programming/gcc/7.3.0/bin/g++
-CXXCPP = /opt/psi/Programming/gcc/7.3.0/bin/g++ -E
+CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
+CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
+CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
 CXXFLAGS = -g -O2
 CYGPATH_W = echo
@@ -269,19 +269,19 @@ DUMPBIN =
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
-FGREP = /usr/bin/grep -F
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
+FGREP = /bin/grep -F
+GREP = /bin/grep
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -L/opt/gfa/python-3.5/latest/lib  -Wl,-rpath,/opt/gfa/python-3.5/latest/lib -L/opt/gfa/python-3.5/latest/lib   -Wl,-rpath,/opt/gfa/python-3.5/latest/lib 
+LD = /bin/ld -m elf_x86_64
+LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQtXml -lQtCore -lpython3.5m 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -289,8 +289,8 @@ LTLIBOBJS =
 LT_SYS_LIBRARY_PATH = 
 MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
+MKDIR_P = /bin/mkdir -p
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -305,7 +305,7 @@ PACKAGE_URL =
 PACKAGE_VERSION = 1.22.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
@@ -315,7 +315,7 @@ abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 ac_ct_AR = ar
-ac_ct_CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 ac_ct_CXX = 
 ac_ct_DUMPBIN = 
 am__include = include
@@ -344,7 +344,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -352,7 +352,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
--- a/src/makefile
+++ b/src/makefile
@@ -88,7 +88,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = x86_64-pc-linux-gnu
 host_triplet = x86_64-pc-linux-gnu
-am__append_1 = PyCafe.cpp
+#am__append_1 = PyCafe.cpp
 #am__append_2 = zbsCafeService.cpp zbsDataHolders.cpp \
 #		bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c bitshuffle/iochain.c

@@ -146,7 +146,7 @@ am__libcafe_la_SOURCES_DIST = cafe.cpp cafeCache.cpp cafeGroup.cpp \
 	zbsCafeService.cpp zbsDataHolders.cpp \
 	bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c \
 	bitshuffle/iochain.c
-am__objects_1 = PyCafe.lo
+#am__objects_1 = PyCafe.lo
 am__dirstamp = $(am__leading_dot)dirstamp
 #am__objects_2 = zbsCafeService.lo zbsDataHolders.lo \
 #	bitshuffle/bitshuffle_core.lo \
@@ -276,22 +276,22 @@ AMTAR = $${TAR-tar}
 #if HAVE_PYTHON_
 #libcafe_la_SOURCES += pycafe/PyCafe.cpp
 #endif
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.5/latest/include/python3.5m -I/opt/gfa/python-3.5/latest/lib/python3.5/site-packages/numpy/core/include  -I/opt/gfa/python-3.5/latest/include  -I/opt/gfa/python-3.5/latest/include/QtCore  -I/opt/gfa/python-3.5/latest/include/QtXml -I$(top_srcdir)/include 
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I$(top_srcdir)/include 
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -L/opt/gfa/python-3.5/latest/lib  -Wl,-rpath,/opt/gfa/python-3.5/latest/lib -L/opt/gfa/python-3.5/latest/lib   -Wl,-rpath,/opt/gfa/python-3.5/latest/lib 
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
-CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
-CPP = /opt/psi/Programming/gcc/7.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.5/latest/include/python3.5m -I/opt/gfa/python-3.5/latest/lib/python3.5/site-packages/numpy/core/include  -I/opt/gfa/python-3.5/latest/include  -I/opt/gfa/python-3.5/latest/include/QtCore  -I/opt/gfa/python-3.5/latest/include/QtXml
-CXX = /opt/psi/Programming/gcc/7.3.0/bin/g++
-CXXCPP = /opt/psi/Programming/gcc/7.3.0/bin/g++ -E
+CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
+CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
+CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
 CXXFLAGS = -g -O2
 CYGPATH_W = echo
@@ -303,19 +303,19 @@ DUMPBIN =
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
-FGREP = /usr/bin/grep -F
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
+FGREP = /bin/grep -F
+GREP = /bin/grep
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -L/opt/gfa/python-3.5/latest/lib  -Wl,-rpath,/opt/gfa/python-3.5/latest/lib -L/opt/gfa/python-3.5/latest/lib   -Wl,-rpath,/opt/gfa/python-3.5/latest/lib 
+LD = /bin/ld -m elf_x86_64
+LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQtXml -lQtCore -lpython3.5m 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -323,8 +323,8 @@ LTLIBOBJS =
 LT_SYS_LIBRARY_PATH = 
 MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
+MKDIR_P = /bin/mkdir -p
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -339,7 +339,7 @@ PACKAGE_URL =
 PACKAGE_VERSION = 1.22.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
@@ -349,7 +349,7 @@ abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/src
 abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 ac_ct_AR = ar
-ac_ct_CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 ac_ct_CXX = 
 ac_ct_DUMPBIN = 
 am__include = include
@@ -378,7 +378,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -386,7 +386,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-py35-gcc-7.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin