epics 7.0.8

2024-07-10 16:00:57 +02:00
parent df07cf1a29
commit a1c964f771
9 changed files with 95 additions and 135 deletions
--- a/autogen_sfbd.sh
+++ b/autogen_sfbd.sh
@@ -24,8 +24,8 @@ automake --force --add-missing --copy
 #Used by ./configure
 #Assumes format ${EPICS}/base-3.14.12
 #source cafeVersion-gcc-7.3.0
-CAFE_V="cafe-1.20.1"
-EPICS_BASE='base-7.0.7' #
+CAFE_V="cafe-1.21.0"
+EPICS_BASE='base-7.0.8' #

 #For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
 #Assume Linux but check if Darwin
--- a/config.log
+++ b/config.log
@@ -4,17 +4,17 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by CAFE configure 1.20.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

-  $ ./configure --prefix=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0 --libdir=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64 --enable-boost-inc --enable-epics7 --enable-qt5 --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=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 --with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 --with-curl=/sf/bd/deps/zmq/curl-7.55.1 --with-lz4=/sf/bd/deps/zmq/lz4/lib --with-epics7=/usr/local/epics/base-7.0.7
+  $ ./configure --prefix=/opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0 --libdir=/opt/gfa/cafe/cpp/cafe-1.21.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=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 --with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 --with-curl=/sf/bd/deps/zmq/curl-7.55.1 --with-lz4=/sf/bd/deps/zmq/lz4/lib --with-epics7=/usr/local/epics/base-7.0.8

 ## --------- ##
 ## Platform. ##
 ## --------- ##

-hostname = sf-lc8.psi.ch
+hostname = sls-lc8.psi.ch
 uname -m = x86_64
-uname -r = 4.18.0-513.11.1.el8_9.x86_64
+uname -r = 4.18.0-553.5.1.el8_10.x86_64
 uname -s = Linux
-uname -v = #1 SMP Thu Dec 7 03:06:13 EST 2023
+uname -v = #1 SMP Tue May 21 03:13:04 EDT 2024

 /usr/bin/uname -p = x86_64
 /bin/uname -X     = unknown
@@ -38,10 +38,9 @@ PATH: /usr/local/bin
 PATH: /usr/bin
 PATH: /usr/local/sbin
 PATH: /usr/sbin
-PATH: /usr/local/epics/base-7.0.7/bin/RHEL8-x86_64
-PATH: /sf/controls/bin
-PATH: /sf/diag/bin
-PATH: /sf/bd/bin
+PATH: /usr/local/epics/base-7.0.8/bin/RHEL8-x86_64
+PATH: /sls/bd/bin
+PATH: /sls/controls/bin
 PATH: /opt/puppetlabs/bin
 PATH: /afs/psi.ch/project/zeromq/deps/pycharm-community-2018.1.4/bin
 PATH: /afs/psi.ch/user/c/chrin/Downloads/astyle/build/gcc/bin
@@ -78,7 +77,7 @@ configure:3209: $? = 0
 configure:3198: /opt/psi/Programming/gcc/10.4.0/bin/g++ -v >&5
 Using built-in specs.
 COLLECT_GCC=/opt/psi/Programming/gcc/10.4.0/bin/g++
-COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/10.4.0/lto-wrapper
+COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/10.4.0/lto-wrapper
 Target: x86_64-pc-linux-gnu
 Configured with: /opt/psi/var/tmp/gsell/gcc-10.4.0/src/configure --prefix=/opt/psi/Programming/gcc/10.4.0 --enable-languages=c,c++,objc,obj-c++,lto,fortran,go --with-gmp=/opt/psi/Libraries/gmp/6.2.1 --with-mpfr=/opt/psi/Libraries/mpfr/4.1.0 --with-mpc=/opt/psi/Libraries/mpc/1.2.1 --enable-lto --disable-multilib --with-pkgversion=''\''PSI Environment Module'\''' --with-build-config=bootstrap-debug
 Thread model: posix
@@ -149,7 +148,7 @@ configure:4266: $? = 0
 configure:4255: /opt/psi/Programming/gcc/10.4.0/bin/gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=/opt/psi/Programming/gcc/10.4.0/bin/gcc
-COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/10.4.0/lto-wrapper
+COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/10.4.0/lto-wrapper
 Target: x86_64-pc-linux-gnu
 Configured with: /opt/psi/var/tmp/gsell/gcc-10.4.0/src/configure --prefix=/opt/psi/Programming/gcc/10.4.0 --enable-languages=c,c++,objc,obj-c++,lto,fortran,go --with-gmp=/opt/psi/Libraries/gmp/6.2.1 --with-mpfr=/opt/psi/Libraries/mpfr/4.1.0 --with-mpc=/opt/psi/Libraries/mpc/1.2.1 --enable-lto --disable-multilib --with-pkgversion=''\''PSI Environment Module'\''' --with-build-config=bootstrap-debug
 Thread model: posix
@@ -492,70 +491,50 @@ configure:15742: result: GNU/Linux ld.so
 configure:15807: checking how to hardcode library paths into programs
 configure:15832: result: immediate
 configure:16057: checking cadef.h usability
-configure:16057: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc conftest.cpp >&5
+configure:16057: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc conftest.cpp >&5
 configure:16057: $? = 0
 configure:16057: result: yes
 configure:16057: checking cadef.h presence
-configure:16057: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc conftest.cpp
+configure:16057: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc conftest.cpp
 configure:16057: $? = 0
 configure:16057: result: yes
 configure:16057: checking for cadef.h
 configure:16057: result: yes
 configure:16076: checking epicsTypes.h usability
-configure:16076: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc conftest.cpp >&5
+configure:16076: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc conftest.cpp >&5
 configure:16076: $? = 0
 configure:16076: result: yes
 configure:16076: checking epicsTypes.h presence
-configure:16076: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc conftest.cpp
+configure:16076: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc conftest.cpp
 configure:16076: $? = 0
 configure:16076: result: yes
 configure:16076: checking for epicsTypes.h
 configure:16076: result: yes
 configure:16093: checking for main in -lca
-configure:16112: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 conftest.cpp -lca   >&5
+configure:16112: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 conftest.cpp -lca   >&5
 /usr/bin/ld: warning: -z nodefs ignored.
 configure:16112: $? = 0
 configure:16121: result: yes
 configure:16134: checking for main in -lCom
-configure:16153: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 conftest.cpp -lCom   >&5
+configure:16153: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 conftest.cpp -lCom   >&5
 /usr/bin/ld: warning: -z nodefs ignored.
 configure:16153: $? = 0
 configure:16162: result: yes
 configure:16175: checking for main in -ldl
-configure:16194: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 conftest.cpp -ldl   >&5
+configure:16194: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 conftest.cpp -ldl   >&5
 /usr/bin/ld: warning: -z nodefs ignored.
 configure:16194: $? = 0
 configure:16203: result: yes
 configure:16408: checking multi_index_container.hpp usability
-configure:16408: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include conftest.cpp >&5
+configure:16408: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include conftest.cpp >&5
 configure:16408: $? = 0
 configure:16408: result: yes
 configure:16408: checking multi_index_container.hpp presence
-configure:16408: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include conftest.cpp
+configure:16408: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include conftest.cpp
 configure:16408: $? = 0
 configure:16408: result: yes
 configure:16408: checking for multi_index_container.hpp
 configure:16408: result: yes
-configure:17122: checking qxml.h usability
-configure:17122: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml conftest.cpp >&5
-configure:17122: $? = 0
-configure:17122: result: yes
-configure:17122: checking qxml.h presence
-configure:17122: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml conftest.cpp
-configure:17122: $? = 0
-configure:17122: result: yes
-configure:17122: checking for qxml.h
-configure:17122: result: yes
-configure:17232: checking for write in -lQt5Core
-configure:17257: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib  conftest.cpp -lQt5Core   >&5
-/usr/bin/ld: warning: -z nodefs ignored.
-configure:17257: $? = 0
-configure:17266: result: yes
-configure:17284: checking for qt_version_tag in -lQt5Xml
-configure:17309: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib  conftest.cpp -lQt5Xml  -lQt5Core  >&5
-/usr/bin/ld: warning: -z nodefs ignored.
-configure:17309: $? = 0
-configure:17318: result: yes
 configure:18169: checking that generated files are newer than configure
 configure:18175: result: done
 configure:18214: creating ./config.status
@@ -573,17 +552,17 @@ generated by GNU Autoconf 2.69.  Invocation command line was
  CONFIG_COMMANDS = 
  $ ./config.status 

-on sf-lc8.psi.ch
+on sls-lc8.psi.ch

-config.status:1178: creating makefile
-config.status:1178: creating src/makefile
-config.status:1178: creating include/makefile
-config.status:1178: creating ./include/config.h
-config.status:1407: executing depfiles commands
-config.status:1484: cd src       && sed -e '/# am--include-marker/d' makefile         | make -f - am--depfiles
+config.status:1168: creating makefile
+config.status:1168: creating src/makefile
+config.status:1168: creating include/makefile
+config.status:1168: creating ./include/config.h
+config.status:1397: executing depfiles commands
+config.status:1474: cd src       && sed -e '/# am--include-marker/d' makefile         | make -f - am--depfiles
 make: Nothing to be done for 'am--depfiles'.
-config.status:1489: $? = 0
-config.status:1407: executing libtool commands
+config.status:1479: $? = 0
+config.status:1397: executing libtool commands

 ## ---------------- ##
 ## Cache variables. ##
@@ -626,7 +605,6 @@ ac_cv_header_epicsTypes_h=yes
 ac_cv_header_inttypes_h=yes
 ac_cv_header_memory_h=yes
 ac_cv_header_multi_index_container_hpp=yes
-ac_cv_header_qxml_h=yes
 ac_cv_header_stdc=yes
 ac_cv_header_stdint_h=yes
 ac_cv_header_stdlib_h=yes
@@ -637,8 +615,6 @@ ac_cv_header_sys_types_h=yes
 ac_cv_header_unistd_h=yes
 ac_cv_host=x86_64-pc-linux-gnu
 ac_cv_lib_Com_main=yes
-ac_cv_lib_Qt5Core_write=yes
-ac_cv_lib_Qt5Xml_qt_version_tag=yes
 ac_cv_lib_ca_main=yes
 ac_cv_lib_dl_main=yes
 ac_cv_objext=o
@@ -710,10 +686,10 @@ AMDEP_FALSE='#'
 AMDEP_TRUE=''
 AMTAR='$${TAR-tar}'
 AM_BACKSLASH='\'
-AM_CPPFLAGS=' -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml'
+AM_CPPFLAGS=' -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/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_V='$(AM_DEFAULT_VERBOSITY)'
 AM_DEFAULT_VERBOSITY='1'
-AM_LDFLAGS=' -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib '
+AM_LDFLAGS=' -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64'
 AM_V='$(V)'
 AR='ar'
 AUTOCONF='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf'
@@ -725,7 +701,7 @@ CC='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
 CCDEPMODE='depmode=gcc3'
 CFLAGS='-g -O2'
 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.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml'
+CPPFLAGS=' -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/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'
@@ -754,9 +730,9 @@ 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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib '
+LDFLAGS=' -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64'
 LIBOBJS=''
-LIBS='-lQt5Xml -lQt5Core '
+LIBS=''
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 LIPO=''
 LN_S='ln -s'
@@ -822,7 +798,7 @@ htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
 install_sh='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh'
-libdir='/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64'
+libdir='/opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0/lib/RHEL8-x86_64'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
 localstatedir='${prefix}/var'
@@ -830,7 +806,7 @@ mandir='${datarootdir}/man'
 mkdir_p='$(MKDIR_P)'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0'
+prefix='/opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
@@ -866,17 +842,11 @@ target_alias=''
 #define HAVE_LINUX 1
 #define HAVE_CADEF_H 1
 #define HAVE_EPICSTYPES_H 1
-#define HAVE_EPICS 7.0.7
+#define HAVE_EPICS 7.0.8
 #define EPICS_MAJOR 7
 #define EPICS_MINOR 0
-#define EPICS_PATCH 7
+#define EPICS_PATCH 8
 #define HAVE_MULTI_INDEX_CONTAINER_HPP 1
 #define HAVE_BOOST 1
-#define HAVE_QXML_H 1
-#define HAVE_LIBQT5CORE 1
-#define HAVE_LIBQT5XML 1
-#define HAVE_QT 1
-#define HAVE_LIBQTXML 1
-#define QT_NO_VERSION_TAGGING 1

 configure: exit 0
--- 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.20.1-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-qt5' '--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=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.7' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc'"
+ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.21.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=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.8' '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.20.1
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -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.20.1-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-qt5' '--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=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.7' '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
+  set X /bin/sh './configure'  '--prefix=/opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.21.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=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.8' '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'
@@ -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/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/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.x86_64_slp6/Programming/gcc/10.4.0/lib /lib /usr/lib '
-configure_time_dlsearch_path='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst                /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ '
+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='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas                /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'
@@ -735,12 +735,12 @@ 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/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.x86_64_slp6/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.x86_64_slp6/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.x86_64_slp6/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.x86_64_slp6/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.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.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/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/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.x86_64_slp6/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.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.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/10.4.0/bin/gcc'
 LTCFLAGS='-g -O2'
@@ -883,11 +883,9 @@ 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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpat"\
-"h,/opt/gfa/python-3.7/latest/lib "
-S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/ba"\
-"se-7.0.7/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.7/lat"\
-"est/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml"
+S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64"
+S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/ba"\
+"se-7.0.8/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/10.4.0/bin/g++ -E"
 S["CPP"]="/opt/psi/Programming/gcc/10.4.0/bin/gcc -E"
@@ -939,11 +937,9 @@ S["DEPDIR"]=".deps"
 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.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/ba"\
-"se-7.0.7/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.7/lat"\
-"est/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml"
-S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpat"\
-"h,/opt/gfa/python-3.7/latest/lib "
+S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/ba"\
+"se-7.0.8/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.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64"
 S["CXXFLAGS"]="-g -O2"
 S["CXX"]="/opt/psi/Programming/gcc/10.4.0/bin/g++"
 S["AM_BACKSLASH"]="\\"
@@ -976,14 +972,14 @@ S["INSTALL_PROGRAM"]="${INSTALL}"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
-S["LIBS"]="-lQt5Xml -lQt5Core "
+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.20.1-gcc-10.4.0/lib/RHEL8-x86_64"
+S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0/lib/RHEL8-x86_64"
 S["psdir"]="${docdir}"
 S["pdfdir"]="${docdir}"
 S["dvidir"]="${docdir}"
@@ -1001,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.20.1-gcc-10.4.0"
+S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0"
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_URL"]=""
 S["PACKAGE_BUGREPORT"]="Bug reports to: jan.chrin@psi.ch"
@@ -1076,18 +1072,12 @@ D["LT_OBJDIR"]=" \".libs/\""
 D["HAVE_LINUX"]=" 1"
 D["HAVE_CADEF_H"]=" 1"
 D["HAVE_EPICSTYPES_H"]=" 1"
-D["HAVE_EPICS"]=" 7.0.7"
+D["HAVE_EPICS"]=" 7.0.8"
 D["EPICS_MAJOR"]=" 7"
 D["EPICS_MINOR"]=" 0"
-D["EPICS_PATCH"]=" 7"
+D["EPICS_PATCH"]=" 8"
 D["HAVE_MULTI_INDEX_CONTAINER_HPP"]=" 1"
 D["HAVE_BOOST"]=" 1"
-D["HAVE_QXML_H"]=" 1"
-D["HAVE_LIBQT5CORE"]=" 1"
-D["HAVE_LIBQT5XML"]=" 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
@@ -8,7 +8,7 @@
 #define EPICS_MINOR 0

 /* epics patch release */
-#define EPICS_PATCH 7
+#define EPICS_PATCH 8

 /* Availability of boost */
 #define HAVE_BOOST 1
@@ -29,7 +29,7 @@
 #define HAVE_DLFCN_H 1

 /* epics version */
-#define HAVE_EPICS 7.0.7
+#define HAVE_EPICS 7.0.8

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

 /* Define to 1 if you have the `Qt5Core' library (-lQt5Core). */
-#define HAVE_LIBQT5CORE 1
+/* #undef HAVE_LIBQT5CORE */

 /* Define to 1 if you have the `Qt5Xml' library (-lQt5Xml). */
-#define HAVE_LIBQT5XML 1
+/* #undef HAVE_LIBQT5XML */

 /* Define to 1 if you have the `QtCore' library (-lQtCore). */
 /* #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 */
@@ -111,10 +111,10 @@
 /* #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.20.1"

 /* 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
@@ -199,9 +199,9 @@ am__DIST_COMMON = $(srcdir)/makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/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.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
@@ -212,7 +212,7 @@ CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 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.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/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
@@ -236,9 +236,9 @@ 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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -301,7 +301,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.21.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.20.1-gcc-10.4.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
--- a/14
+++ b/14
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Generated automatically by config.status (cafe) 1.20.1
-# Libtool was configured on host sf-lc8.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.
@@ -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/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/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.x86_64_slp6/Programming/gcc/10.4.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/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ "
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas                /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=""
@@ -11794,17 +11794,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/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.x86_64_slp6/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.x86_64_slp6/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.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.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/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o"
-postdep_objects="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.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/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/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.x86_64_slp6/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.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.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/14
+++ b/14
@@ -242,9 +242,9 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/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.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml -I$(top_srcdir)/include 
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib  @CAFE_LIBS@
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 @CAFE_LIBS@
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
@@ -255,7 +255,7 @@ CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 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.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/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
@@ -279,9 +279,9 @@ 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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -344,7 +344,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.21.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.20.1-gcc-10.4.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
--- a/src/makefile
+++ b/src/makefile
@@ -276,9 +276,9 @@ 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.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml -I$(top_srcdir)/include 
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
@@ -289,7 +289,7 @@ CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 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.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.8/include/ -I/usr/local/epics/base-7.0.8/include/os/Linux -I/usr/local/epics/base-7.0.8/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
@@ -313,9 +313,9 @@ 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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.8/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -378,7 +378,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.21.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.20.1-gcc-10.4.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.21.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -406,7 +406,7 @@ lib_LTLIBRARIES = libcafe.la
 #2nd: age
 #3rd: revision
 #1.9.2   1.10.2     1.11.0 1.11.1   1.12.0 1.12.1 1.12.2    1.12.4
-libcafe_la_LDFLAGS = -version-info 21:1:20
+libcafe_la_LDFLAGS = -version-info 22:0:21
 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp \
 	cafeVectors.cpp cafeXML.cpp callbackHandlerCreate.cpp \
 	callbackHandlerMonitor.cpp conduit.cpp connect.cpp \
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libcafe.la
 #2nd: age
 #3rd: revision
 #1.9.2   1.10.2     1.11.0 1.11.1   1.12.0 1.12.1 1.12.2    1.12.4
-libcafe_la_LDFLAGS = -version-info 21:1:20
+libcafe_la_LDFLAGS = -version-info 22:0:21

 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp cafeVectors.cpp cafeXML.cpp \
 		callbackHandlerCreate.cpp callbackHandlerMonitor.cpp conduit.cpp connect.cpp connectCallbacks.cpp \