diff --git a/autogen_sfbd.sh b/autogen_sfbd.sh index f9d91dc..c905af1 100644 --- a/autogen_sfbd.sh +++ b/autogen_sfbd.sh @@ -3,8 +3,8 @@ # default is sf # module unload gcc -module load gcc/7.5.0 #7.5.0 for py38 py310 7.3.0 py37 -#module load gcc/8.5.0 #rhel8 +#module load gcc/7.3.0 #7.5.0 for py38 py310 7.3.0 py37 +module load gcc/10.4.0 ##rhel8 ### psi specific - end rm -f configure.ac @@ -24,7 +24,7 @@ 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.19.3" +CAFE_V="cafe-1.20.1" EPICS_BASE='base-7.0.7' # #For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH @@ -52,8 +52,11 @@ echo $EPICS_BASE FACILITY=$(echo "$1" | tr '[:upper:]' '[:lower:]') CACLIENT=$(echo "$2" | tr '[:upper:]' '[:lower:]') -FACILITY_DEFAULT="sf" -CACLIENT_DEFAULT="python" +#FACILITY_DEFAULT="sf" +#CACLIENT_DEFAULT="python" + +FACILITY_DEFAULT="sls2" +CACLIENT_DEFAULT="py37" FACILITY_TEMP="" CACLIENT_TEMP="" @@ -92,7 +95,7 @@ fi if [ -z "$FACILITY" ] then - FACILITY="sf" + FACILITY=$FACILITY_DEFAULT echo "FACILITY = " $FACILITY if [ -z $CACLIENT ] then diff --git a/config.log b/config.log index 64ebd16..195b735 100644 --- a/config.log +++ b/config.log @@ -1,10 +1,10 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by CAFE configure 1.19.3, which was +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.19.3-py310-gcc-7.5.0 --libdir=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64 --enable-boost-inc --enable-epics7 --enable-python310 --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.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 ## --------- ## ## Platform. ## @@ -12,9 +12,9 @@ generated by GNU Autoconf 2.69. Invocation command line was hostname = sf-lc8.psi.ch uname -m = x86_64 -uname -r = 4.18.0-477.15.1.el8_8.x86_64 +uname -r = 4.18.0-513.11.1.el8_9.x86_64 uname -s = Linux -uname -v = #1 SMP Fri Jun 2 08:27:19 EDT 2023 +uname -v = #1 SMP Thu Dec 7 03:06:13 EST 2023 /usr/bin/uname -p = x86_64 /bin/uname -X = unknown @@ -27,17 +27,18 @@ uname -v = #1 SMP Fri Jun 2 08:27:19 EDT 2023 /usr/bin/oslevel = unknown /bin/universe = unknown -PATH: /opt/psi/Programming/gcc/7.5.0/bin +PATH: /opt/psi/Programming/gcc/10.4.0/bin +PATH: /opt/psi/Programming/matlab/2024a/bin PATH: /usr/local/epics/seq/bin/RHEL8-x86_64 PATH: . PATH: /usr/lib/openoffice.org/program PATH: /opt/psi/Tools/HDFView/3.1.2/bin -PATH: /opt/psi/Programming/matlab/2018a/bin PATH: /usr/share/Modules/bin 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 @@ -67,58 +68,59 @@ configure:2894: result: yes configure:2923: checking whether make supports nested variables configure:2940: result: yes configure:3189: checking for C++ compiler version -configure:3198: /opt/psi/Programming/gcc/7.5.0/bin/g++ --version >&5 -g++ ('PSI Environment Module') 7.5.0 -Copyright (C) 2017 Free Software Foundation, Inc. +configure:3198: /opt/psi/Programming/gcc/10.4.0/bin/g++ --version >&5 +g++ ('PSI Environment Module') 10.4.0 +Copyright (C) 2020 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. configure:3209: $? = 0 -configure:3198: /opt/psi/Programming/gcc/7.5.0/bin/g++ -v >&5 +configure:3198: /opt/psi/Programming/gcc/10.4.0/bin/g++ -v >&5 Using built-in specs. -COLLECT_GCC=/opt/psi/Programming/gcc/7.5.0/bin/g++ -COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/7.5.0/lto-wrapper +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 Target: x86_64-pc-linux-gnu -Configured with: /var/tmp/gsell/gcc-7.5.0/src/configure --prefix=/opt/psi/Programming/gcc/7.5.0 --with-gmp=/opt/psi/Libraries/gmp/6.2.0 --with-mpfr=/opt/psi/Libraries/mpfr/4.0.2-1 --with-mpc=/opt/psi/Libraries/mpc/1.1.0-4 --enable-lto --disable-multilib --with-build-config=bootstrap-debug --with-pkgversion=''\''PSI Environment Module'\''' --with-build-config=bootstrap-debug +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 -gcc version 7.5.0 ('PSI Environment Module') +Supported LTO compression algorithms: zlib +gcc version 10.4.0 ('PSI Environment Module') configure:3209: $? = 0 -configure:3198: /opt/psi/Programming/gcc/7.5.0/bin/g++ -V >&5 -g++: error: unrecognized command line option '-V' +configure:3198: /opt/psi/Programming/gcc/10.4.0/bin/g++ -V >&5 +g++: error: unrecognized command-line option '-V' g++: fatal error: no input files compilation terminated. configure:3209: $? = 1 -configure:3198: /opt/psi/Programming/gcc/7.5.0/bin/g++ -qversion >&5 -g++: error: unrecognized command line option '-qversion'; did you mean '--version'? +configure:3198: /opt/psi/Programming/gcc/10.4.0/bin/g++ -qversion >&5 +g++: error: unrecognized command-line option '-qversion'; did you mean '--version'? g++: fatal error: no input files compilation terminated. configure:3209: $? = 1 configure:3229: checking whether the C++ compiler works -configure:3251: /opt/psi/Programming/gcc/7.5.0/bin/g++ conftest.cpp >&5 +configure:3251: /opt/psi/Programming/gcc/10.4.0/bin/g++ conftest.cpp >&5 configure:3255: $? = 0 configure:3303: result: yes configure:3306: checking for C++ compiler default output file name configure:3308: result: a.out configure:3314: checking for suffix of executables -configure:3321: /opt/psi/Programming/gcc/7.5.0/bin/g++ -o conftest conftest.cpp >&5 +configure:3321: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest conftest.cpp >&5 configure:3325: $? = 0 configure:3347: result: configure:3369: checking whether we are cross compiling -configure:3377: /opt/psi/Programming/gcc/7.5.0/bin/g++ -o conftest conftest.cpp >&5 +configure:3377: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest conftest.cpp >&5 configure:3381: $? = 0 configure:3388: ./conftest configure:3392: $? = 0 configure:3407: result: no configure:3412: checking for suffix of object files -configure:3434: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c conftest.cpp >&5 +configure:3434: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c conftest.cpp >&5 configure:3438: $? = 0 configure:3459: result: o configure:3463: checking whether we are using the GNU C++ compiler -configure:3482: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c conftest.cpp >&5 +configure:3482: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c conftest.cpp >&5 configure:3482: $? = 0 configure:3491: result: yes -configure:3500: checking whether /opt/psi/Programming/gcc/7.5.0/bin/g++ accepts -g -configure:3520: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g conftest.cpp >&5 +configure:3500: checking whether /opt/psi/Programming/gcc/10.4.0/bin/g++ accepts -g +configure:3520: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g conftest.cpp >&5 configure:3520: $? = 0 configure:3561: result: yes configure:3587: checking whether make supports the include directive @@ -126,7 +128,7 @@ configure:3602: make -f confmf.GNU && cat confinc.out this is the am__doit target configure:3605: $? = 0 configure:3624: result: yes (GNU style) -configure:3649: checking dependency style of /opt/psi/Programming/gcc/7.5.0/bin/g++ +configure:3649: checking dependency style of /opt/psi/Programming/gcc/10.4.0/bin/g++ configure:3760: result: gcc3 configure:3806: checking build system type configure:3820: result: x86_64-pc-linux-gnu @@ -135,53 +137,54 @@ configure:3853: result: x86_64-pc-linux-gnu configure:3894: checking how to print strings configure:3921: result: printf configure:3990: checking for gcc -configure:4017: result: /opt/psi/Programming/gcc/7.5.0/bin/gcc +configure:4017: result: /opt/psi/Programming/gcc/10.4.0/bin/gcc configure:4246: checking for C compiler version -configure:4255: /opt/psi/Programming/gcc/7.5.0/bin/gcc --version >&5 -gcc ('PSI Environment Module') 7.5.0 -Copyright (C) 2017 Free Software Foundation, Inc. +configure:4255: /opt/psi/Programming/gcc/10.4.0/bin/gcc --version >&5 +gcc ('PSI Environment Module') 10.4.0 +Copyright (C) 2020 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. configure:4266: $? = 0 -configure:4255: /opt/psi/Programming/gcc/7.5.0/bin/gcc -v >&5 +configure:4255: /opt/psi/Programming/gcc/10.4.0/bin/gcc -v >&5 Using built-in specs. -COLLECT_GCC=/opt/psi/Programming/gcc/7.5.0/bin/gcc -COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/7.5.0/lto-wrapper +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 Target: x86_64-pc-linux-gnu -Configured with: /var/tmp/gsell/gcc-7.5.0/src/configure --prefix=/opt/psi/Programming/gcc/7.5.0 --with-gmp=/opt/psi/Libraries/gmp/6.2.0 --with-mpfr=/opt/psi/Libraries/mpfr/4.0.2-1 --with-mpc=/opt/psi/Libraries/mpc/1.1.0-4 --enable-lto --disable-multilib --with-build-config=bootstrap-debug --with-pkgversion=''\''PSI Environment Module'\''' --with-build-config=bootstrap-debug +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 -gcc version 7.5.0 ('PSI Environment Module') +Supported LTO compression algorithms: zlib +gcc version 10.4.0 ('PSI Environment Module') configure:4266: $? = 0 -configure:4255: /opt/psi/Programming/gcc/7.5.0/bin/gcc -V >&5 -gcc: error: unrecognized command line option '-V' +configure:4255: /opt/psi/Programming/gcc/10.4.0/bin/gcc -V >&5 +gcc: error: unrecognized command-line option '-V' gcc: fatal error: no input files compilation terminated. configure:4266: $? = 1 -configure:4255: /opt/psi/Programming/gcc/7.5.0/bin/gcc -qversion >&5 -gcc: error: unrecognized command line option '-qversion'; did you mean '--version'? +configure:4255: /opt/psi/Programming/gcc/10.4.0/bin/gcc -qversion >&5 +gcc: error: unrecognized command-line option '-qversion'; did you mean '--version'? gcc: fatal error: no input files compilation terminated. configure:4266: $? = 1 configure:4270: checking whether we are using the GNU C compiler -configure:4289: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c conftest.c >&5 +configure:4289: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c conftest.c >&5 configure:4289: $? = 0 configure:4298: result: yes -configure:4307: checking whether /opt/psi/Programming/gcc/7.5.0/bin/gcc accepts -g -configure:4327: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g conftest.c >&5 +configure:4307: checking whether /opt/psi/Programming/gcc/10.4.0/bin/gcc accepts -g +configure:4327: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g conftest.c >&5 configure:4327: $? = 0 configure:4368: result: yes -configure:4385: checking for /opt/psi/Programming/gcc/7.5.0/bin/gcc option to accept ISO C89 -configure:4448: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:4385: checking for /opt/psi/Programming/gcc/10.4.0/bin/gcc option to accept ISO C89 +configure:4448: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:4448: $? = 0 configure:4461: result: none needed -configure:4486: checking whether /opt/psi/Programming/gcc/7.5.0/bin/gcc understands -c and -o together -configure:4508: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c conftest.c -o conftest2.o +configure:4486: checking whether /opt/psi/Programming/gcc/10.4.0/bin/gcc understands -c and -o together +configure:4508: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c conftest.c -o conftest2.o configure:4511: $? = 0 -configure:4508: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c conftest.c -o conftest2.o +configure:4508: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c conftest.c -o conftest2.o configure:4511: $? = 0 configure:4523: result: yes -configure:4542: checking dependency style of /opt/psi/Programming/gcc/7.5.0/bin/gcc +configure:4542: checking dependency style of /opt/psi/Programming/gcc/10.4.0/bin/gcc configure:4653: result: gcc3 configure:4668: checking for a sed that does not truncate output configure:4732: result: /usr/bin/sed @@ -191,14 +194,14 @@ configure:4813: checking for egrep configure:4875: result: /usr/bin/grep -E configure:4880: checking for fgrep configure:4942: result: /usr/bin/grep -F -configure:4977: checking for ld used by /opt/psi/Programming/gcc/7.5.0/bin/gcc +configure:4977: checking for ld used by /opt/psi/Programming/gcc/10.4.0/bin/gcc configure:5044: result: /usr/bin/ld configure:5051: checking if the linker (/usr/bin/ld) is GNU ld configure:5066: result: yes configure:5078: checking for BSD- or MS-compatible name lister (nm) configure:5132: result: /usr/bin/nm -B configure:5262: checking the name lister (/usr/bin/nm -B) interface -configure:5269: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 conftest.cpp >&5 +configure:5269: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2 conftest.cpp >&5 configure:5272: /usr/bin/nm -B "conftest.o" configure:5275: output 0000000000000000 B some_variable @@ -226,7 +229,7 @@ configure:6123: checking for ar configure:6139: found /usr/bin/ar configure:6150: result: ar configure:6187: checking for archiver @FILE support -configure:6204: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 conftest.cpp >&5 +configure:6204: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2 conftest.cpp >&5 configure:6204: $? = 0 configure:6207: ar cru libconftest.a @conftest.lst >&5 configure:6210: $? = 0 @@ -240,12 +243,12 @@ configure:6315: result: strip configure:6387: checking for ranlib configure:6403: found /usr/bin/ranlib configure:6414: result: ranlib -configure:6516: checking command to parse /usr/bin/nm -B output from /opt/psi/Programming/gcc/7.5.0/bin/gcc object -configure:6669: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 conftest.cpp >&5 +configure:6516: checking command to parse /usr/bin/nm -B output from /opt/psi/Programming/gcc/10.4.0/bin/gcc object +configure:6669: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2 conftest.cpp >&5 configure:6672: $? = 0 configure:6676: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm configure:6679: $? = 0 -configure:6745: /opt/psi/Programming/gcc/7.5.0/bin/g++ -o conftest -g -O2 conftest.cpp conftstm.o >&5 +configure:6745: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2 conftest.cpp conftstm.o >&5 configure:6748: $? = 0 configure:6786: result: ok configure:6833: checking for sysroot @@ -254,7 +257,7 @@ configure:6870: checking for a working dd configure:6908: result: /usr/bin/dd configure:6912: checking how to truncate binary pipes configure:6927: result: /usr/bin/dd bs=4096 count=1 -configure:7064: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 conftest.cpp >&5 +configure:7064: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2 conftest.cpp >&5 configure:7067: $? = 0 configure:7257: checking for mt configure:7287: result: no @@ -262,126 +265,126 @@ configure:7307: checking if : is a manifest tool configure:7313: : '-?' configure:7321: result: no configure:7998: checking how to run the C preprocessor -configure:8029: /opt/psi/Programming/gcc/7.5.0/bin/gcc -E conftest.c +configure:8029: /opt/psi/Programming/gcc/10.4.0/bin/gcc -E conftest.c configure:8029: $? = 0 -configure:8043: /opt/psi/Programming/gcc/7.5.0/bin/gcc -E conftest.c +configure:8043: /opt/psi/Programming/gcc/10.4.0/bin/gcc -E conftest.c conftest.c:11:10: fatal error: ac_nonexistent.h: No such file or directory - #include - ^~~~~~~~~~~~~~~~~~ + 11 | #include + | ^~~~~~~~~~~~~~~~~~ compilation terminated. configure:8043: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "CAFE" | #define PACKAGE_TARNAME "cafe" -| #define PACKAGE_VERSION "1.19.3" -| #define PACKAGE_STRING "CAFE 1.19.3" +| #define PACKAGE_VERSION "1.20.1" +| #define PACKAGE_STRING "CAFE 1.20.1" | #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch" | #define PACKAGE_URL "" | #define PACKAGE "cafe" -| #define VERSION "1.19.3" +| #define VERSION "1.20.1" | /* end confdefs.h. */ | #include -configure:8068: result: /opt/psi/Programming/gcc/7.5.0/bin/gcc -E -configure:8088: /opt/psi/Programming/gcc/7.5.0/bin/gcc -E conftest.c +configure:8068: result: /opt/psi/Programming/gcc/10.4.0/bin/gcc -E +configure:8088: /opt/psi/Programming/gcc/10.4.0/bin/gcc -E conftest.c configure:8088: $? = 0 -configure:8102: /opt/psi/Programming/gcc/7.5.0/bin/gcc -E conftest.c +configure:8102: /opt/psi/Programming/gcc/10.4.0/bin/gcc -E conftest.c conftest.c:11:10: fatal error: ac_nonexistent.h: No such file or directory - #include - ^~~~~~~~~~~~~~~~~~ + 11 | #include + | ^~~~~~~~~~~~~~~~~~ compilation terminated. configure:8102: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "CAFE" | #define PACKAGE_TARNAME "cafe" -| #define PACKAGE_VERSION "1.19.3" -| #define PACKAGE_STRING "CAFE 1.19.3" +| #define PACKAGE_VERSION "1.20.1" +| #define PACKAGE_STRING "CAFE 1.20.1" | #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch" | #define PACKAGE_URL "" | #define PACKAGE "cafe" -| #define VERSION "1.19.3" +| #define VERSION "1.20.1" | /* end confdefs.h. */ | #include configure:8131: checking for ANSI C header files -configure:8151: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8151: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8151: $? = 0 -configure:8224: /opt/psi/Programming/gcc/7.5.0/bin/gcc -o conftest -g -O2 conftest.c >&5 +configure:8224: /opt/psi/Programming/gcc/10.4.0/bin/gcc -o conftest -g -O2 conftest.c >&5 configure:8224: $? = 0 configure:8224: ./conftest configure:8224: $? = 0 configure:8235: result: yes configure:8248: checking for sys/types.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8248: checking for sys/stat.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8248: checking for stdlib.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8248: checking for string.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8248: checking for memory.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8248: checking for strings.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8248: checking for inttypes.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8248: checking for stdint.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8248: checking for unistd.h -configure:8248: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8248: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8248: $? = 0 configure:8248: result: yes configure:8262: checking for dlfcn.h -configure:8262: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:8262: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:8262: $? = 0 configure:8262: result: yes configure:8528: checking for objdir configure:8543: result: .libs -configure:8807: checking if /opt/psi/Programming/gcc/7.5.0/bin/gcc supports -fno-rtti -fno-exceptions -configure:8825: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5 -cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C +configure:8807: checking if /opt/psi/Programming/gcc/10.4.0/bin/gcc supports -fno-rtti -fno-exceptions +configure:8825: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5 +cc1: warning: command-line option '-fno-rtti' is valid for C++/D/ObjC++ but not for C configure:8829: $? = 0 configure:8842: result: no -configure:9200: checking for /opt/psi/Programming/gcc/7.5.0/bin/gcc option to produce PIC +configure:9200: checking for /opt/psi/Programming/gcc/10.4.0/bin/gcc option to produce PIC configure:9207: result: -fPIC -DPIC -configure:9215: checking if /opt/psi/Programming/gcc/7.5.0/bin/gcc PIC flag -fPIC -DPIC works -configure:9233: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5 +configure:9215: checking if /opt/psi/Programming/gcc/10.4.0/bin/gcc PIC flag -fPIC -DPIC works +configure:9233: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5 configure:9237: $? = 0 configure:9250: result: yes -configure:9279: checking if /opt/psi/Programming/gcc/7.5.0/bin/gcc static flag -static works +configure:9279: checking if /opt/psi/Programming/gcc/10.4.0/bin/gcc static flag -static works configure:9307: result: no -configure:9322: checking if /opt/psi/Programming/gcc/7.5.0/bin/gcc supports -c -o file.o -configure:9343: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 -o out/conftest2.o conftest.c >&5 +configure:9322: checking if /opt/psi/Programming/gcc/10.4.0/bin/gcc supports -c -o file.o +configure:9343: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 -o out/conftest2.o conftest.c >&5 configure:9347: $? = 0 configure:9369: result: yes -configure:9377: checking if /opt/psi/Programming/gcc/7.5.0/bin/gcc supports -c -o file.o +configure:9377: checking if /opt/psi/Programming/gcc/10.4.0/bin/gcc supports -c -o file.o configure:9424: result: yes -configure:9457: checking whether the /opt/psi/Programming/gcc/7.5.0/bin/gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries +configure:9457: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries configure:10716: result: yes configure:10753: checking whether -lc should be explicitly linked in -configure:10761: /opt/psi/Programming/gcc/7.5.0/bin/gcc -c -g -O2 conftest.c >&5 +configure:10761: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2 conftest.c >&5 configure:10764: $? = 0 -configure:10779: /opt/psi/Programming/gcc/7.5.0/bin/gcc -shared -fPIC -DPIC conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep -lc \>/dev/null 2\>\&1 +configure:10779: /opt/psi/Programming/gcc/10.4.0/bin/gcc -shared -fPIC -DPIC conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep -lc \>/dev/null 2\>\&1 configure:10782: $? = 0 configure:10796: result: no configure:10956: checking dynamic linker characteristics -configure:11537: /opt/psi/Programming/gcc/7.5.0/bin/gcc -o conftest -g -O2 -Wl,-rpath -Wl,/foo conftest.c >&5 +configure:11537: /opt/psi/Programming/gcc/10.4.0/bin/gcc -o conftest -g -O2 -Wl,-rpath -Wl,/foo conftest.c >&5 configure:11537: $? = 0 configure:11777: result: GNU/Linux ld.so configure:11899: checking how to hardcode library paths into programs @@ -395,24 +398,24 @@ configure:12542: result: yes configure:12545: checking whether to build static libraries configure:12549: result: yes configure:12572: checking how to run the C++ preprocessor -configure:12599: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E conftest.cpp +configure:12599: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E conftest.cpp configure:12599: $? = 0 -configure:12613: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E conftest.cpp +configure:12613: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E conftest.cpp conftest.cpp:23:10: fatal error: ac_nonexistent.h: No such file or directory - #include - ^~~~~~~~~~~~~~~~~~ + 23 | #include + | ^~~~~~~~~~~~~~~~~~ compilation terminated. configure:12613: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "CAFE" | #define PACKAGE_TARNAME "cafe" -| #define PACKAGE_VERSION "1.19.3" -| #define PACKAGE_STRING "CAFE 1.19.3" +| #define PACKAGE_VERSION "1.20.1" +| #define PACKAGE_STRING "CAFE 1.20.1" | #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch" | #define PACKAGE_URL "" | #define PACKAGE "cafe" -| #define VERSION "1.19.3" +| #define VERSION "1.20.1" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -427,25 +430,25 @@ configure: failed program was: | #define LT_OBJDIR ".libs/" | /* end confdefs.h. */ | #include -configure:12638: result: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E -configure:12658: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E conftest.cpp +configure:12638: result: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E +configure:12658: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E conftest.cpp configure:12658: $? = 0 -configure:12672: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E conftest.cpp +configure:12672: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E conftest.cpp conftest.cpp:23:10: fatal error: ac_nonexistent.h: No such file or directory - #include - ^~~~~~~~~~~~~~~~~~ + 23 | #include + | ^~~~~~~~~~~~~~~~~~ compilation terminated. configure:12672: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "CAFE" | #define PACKAGE_TARNAME "cafe" -| #define PACKAGE_VERSION "1.19.3" -| #define PACKAGE_STRING "CAFE 1.19.3" +| #define PACKAGE_VERSION "1.20.1" +| #define PACKAGE_STRING "CAFE 1.20.1" | #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch" | #define PACKAGE_URL "" | #define PACKAGE "cafe" -| #define VERSION "1.19.3" +| #define VERSION "1.20.1" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -460,99 +463,108 @@ configure: failed program was: | #define LT_OBJDIR ".libs/" | /* end confdefs.h. */ | #include -configure:12834: checking for ld used by /opt/psi/Programming/gcc/7.5.0/bin/g++ +configure:12834: checking for ld used by /opt/psi/Programming/gcc/10.4.0/bin/g++ configure:12901: result: /usr/bin/ld -m elf_x86_64 configure:12908: checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld configure:12923: result: yes -configure:12978: checking whether the /opt/psi/Programming/gcc/7.5.0/bin/g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries +configure:12978: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries configure:14051: result: yes -configure:14087: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 conftest.cpp >&5 +configure:14087: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2 conftest.cpp >&5 configure:14090: $? = 0 -configure:14571: checking for /opt/psi/Programming/gcc/7.5.0/bin/g++ option to produce PIC +configure:14571: checking for /opt/psi/Programming/gcc/10.4.0/bin/g++ option to produce PIC configure:14578: result: -fPIC -DPIC -configure:14586: checking if /opt/psi/Programming/gcc/7.5.0/bin/g++ PIC flag -fPIC -DPIC works -configure:14604: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 -fPIC -DPIC -DPIC conftest.cpp >&5 +configure:14586: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ PIC flag -fPIC -DPIC works +configure:14604: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2 -fPIC -DPIC -DPIC conftest.cpp >&5 configure:14608: $? = 0 configure:14621: result: yes -configure:14644: checking if /opt/psi/Programming/gcc/7.5.0/bin/g++ static flag -static works +configure:14644: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ static flag -static works configure:14672: result: no -configure:14684: checking if /opt/psi/Programming/gcc/7.5.0/bin/g++ supports -c -o file.o -configure:14705: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 -o out/conftest2.o conftest.cpp >&5 +configure:14684: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ supports -c -o file.o +configure:14705: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2 -o out/conftest2.o conftest.cpp >&5 configure:14709: $? = 0 configure:14731: result: yes -configure:14736: checking if /opt/psi/Programming/gcc/7.5.0/bin/g++ supports -c -o file.o +configure:14736: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ supports -c -o file.o configure:14783: result: yes -configure:14813: checking whether the /opt/psi/Programming/gcc/7.5.0/bin/g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries +configure:14813: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries configure:14853: result: yes configure:14994: checking dynamic linker characteristics configure:15742: result: GNU/Linux ld.so configure:15807: checking how to hardcode library paths into programs configure:15832: result: immediate -configure:16056: checking cadef.h usability -configure:16056: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 -fexceptions -fPIC -std=c++1z -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:16056: $? = 0 -configure:16056: result: yes -configure:16056: checking cadef.h presence -configure:16056: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E -fexceptions -fPIC -std=c++1z -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:16056: $? = 0 -configure:16056: result: yes -configure:16056: checking for cadef.h -configure:16056: result: yes -configure:16075: checking epicsTypes.h usability -configure:16075: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 -fexceptions -fPIC -std=c++1z -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:16075: $? = 0 -configure:16075: result: yes -configure:16075: checking epicsTypes.h presence -configure:16075: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E -fexceptions -fPIC -std=c++1z -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:16075: $? = 0 -configure:16075: result: yes -configure:16075: checking for epicsTypes.h -configure:16075: result: yes -configure:16092: checking for main in -lca -configure:16111: /opt/psi/Programming/gcc/7.5.0/bin/g++ -o conftest -g -O2 -fexceptions -fPIC -std=c++1z -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:16111: $? = 0 -configure:16120: result: yes -configure:16133: checking for main in -lCom -configure:16152: /opt/psi/Programming/gcc/7.5.0/bin/g++ -o conftest -g -O2 -fexceptions -fPIC -std=c++1z -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:16152: $? = 0 -configure:16161: result: yes -configure:16174: checking for main in -ldl -configure:16193: /opt/psi/Programming/gcc/7.5.0/bin/g++ -o conftest -g -O2 -fexceptions -fPIC -std=c++1z -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:16193: $? = 0 -configure:16202: result: yes -configure:16407: checking multi_index_container.hpp usability -configure:16407: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 -fexceptions -fPIC -std=c++1z -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:16407: $? = 0 -configure:16407: result: yes -configure:16407: checking multi_index_container.hpp presence -configure:16407: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E -fexceptions -fPIC -std=c++1z -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:16407: $? = 0 -configure:16407: result: yes -configure:16407: checking for multi_index_container.hpp -configure:16407: result: yes -configure:16631: checking Python.h usability -configure:16631: /opt/psi/Programming/gcc/7.5.0/bin/g++ -c -g -O2 -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include conftest.cpp >&5 -configure:16631: $? = 0 -configure:16631: result: yes -configure:16631: checking Python.h presence -configure:16631: /opt/psi/Programming/gcc/7.5.0/bin/g++ -E -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include conftest.cpp -configure:16631: $? = 0 -configure:16631: result: yes -configure:16631: checking for Python.h -configure:16631: result: yes -configure:16650: checking for main in -lpython3.10 -configure:16669: /opt/psi/Programming/gcc/7.5.0/bin/g++ -o conftest -g -O2 -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib conftest.cpp -lpython3.10 >&5 -configure:16669: $? = 0 -configure:16678: result: yes -configure:18168: checking that generated files are newer than configure -configure:18174: result: done -configure:18213: creating ./config.status +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: $? = 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: $? = 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: $? = 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: $? = 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 +/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 +/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 +/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: $? = 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: $? = 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 ## ---------------------- ## ## Running config.status. ## ## ---------------------- ## -This file was extended by CAFE config.status 1.19.3, which was +This file was extended by CAFE config.status 1.20.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = @@ -563,15 +575,15 @@ generated by GNU Autoconf 2.69. Invocation command line was on sf-lc8.psi.ch -config.status:1176: creating makefile -config.status:1176: creating src/makefile -config.status:1176: creating include/makefile -config.status:1176: creating ./include/config.h -config.status:1405: executing depfiles commands -config.status:1482: cd src && sed -e '/# am--include-marker/d' makefile | make -f - am--depfiles +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 make: Nothing to be done for 'am--depfiles'. -config.status:1487: $? = 0 -config.status:1405: executing libtool commands +config.status:1489: $? = 0 +config.status:1407: executing libtool commands ## ---------------- ## ## Cache variables. ## @@ -583,7 +595,7 @@ ac_cv_cxx_compiler_gnu=yes ac_cv_env_CCC_set= ac_cv_env_CCC_value= ac_cv_env_CC_set=set -ac_cv_env_CC_value=/opt/psi/Programming/gcc/7.5.0/bin/gcc +ac_cv_env_CC_value=/opt/psi/Programming/gcc/10.4.0/bin/gcc ac_cv_env_CFLAGS_set= ac_cv_env_CFLAGS_value= ac_cv_env_CPPFLAGS_set= @@ -595,7 +607,7 @@ ac_cv_env_CXXCPP_value= ac_cv_env_CXXFLAGS_set= ac_cv_env_CXXFLAGS_value= ac_cv_env_CXX_set=set -ac_cv_env_CXX_value=/opt/psi/Programming/gcc/7.5.0/bin/g++ +ac_cv_env_CXX_value=/opt/psi/Programming/gcc/10.4.0/bin/g++ ac_cv_env_LDFLAGS_set= ac_cv_env_LDFLAGS_value= ac_cv_env_LIBS_set= @@ -608,13 +620,13 @@ ac_cv_env_host_alias_set= ac_cv_env_host_alias_value= ac_cv_env_target_alias_set= ac_cv_env_target_alias_value= -ac_cv_header_Python_h=yes ac_cv_header_cadef_h=yes ac_cv_header_dlfcn_h=yes 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 @@ -625,9 +637,10 @@ 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_lib_python3_10_main=yes ac_cv_objext=o ac_cv_path_EGREP='/usr/bin/grep -E' ac_cv_path_FGREP='/usr/bin/grep -F' @@ -637,10 +650,10 @@ ac_cv_path_install='/usr/bin/install -c' ac_cv_path_lt_DD=/usr/bin/dd ac_cv_path_mkdir=/usr/bin/mkdir ac_cv_prog_AWK=gawk -ac_cv_prog_CPP='/opt/psi/Programming/gcc/7.5.0/bin/gcc -E' -ac_cv_prog_CXXCPP='/opt/psi/Programming/gcc/7.5.0/bin/g++ -E' +ac_cv_prog_CPP='/opt/psi/Programming/gcc/10.4.0/bin/gcc -E' +ac_cv_prog_CXXCPP='/opt/psi/Programming/gcc/10.4.0/bin/g++ -E' ac_cv_prog_ac_ct_AR=ar -ac_cv_prog_ac_ct_CC=/opt/psi/Programming/gcc/7.5.0/bin/gcc +ac_cv_prog_ac_ct_CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc ac_cv_prog_ac_ct_OBJDUMP=objdump ac_cv_prog_ac_ct_RANLIB=ranlib ac_cv_prog_ac_ct_STRIP=strip @@ -697,10 +710,10 @@ AMDEP_FALSE='#' AMDEP_TRUE='' AMTAR='$${TAR-tar}' AM_BACKSLASH='\' -AM_CPPFLAGS=' -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include' +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_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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib' +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_V='$(V)' AR='ar' AUTOCONF='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf' @@ -708,13 +721,13 @@ AUTOHEADER='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader AUTOMAKE='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16' AWK='gawk' CAFE_CPPFLAGS='-I$(top_srcdir)/include ' -CC='/opt/psi/Programming/gcc/7.5.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.5.0/bin/gcc -E' -CPPFLAGS=' -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include' -CXX='/opt/psi/Programming/gcc/7.5.0/bin/g++' -CXXCPP='/opt/psi/Programming/gcc/7.5.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.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' +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' @@ -730,10 +743,10 @@ EGREP='/usr/bin/grep -E' EXEEXT='' FGREP='/usr/bin/grep -F' GREP='/usr/bin/grep' -HAVE_PYCAFE_EXT__FALSE='#' -HAVE_PYCAFE_EXT__TRUE='' -HAVE_PYTHON__FALSE='#' -HAVE_PYTHON__TRUE='' +HAVE_PYCAFE_EXT__FALSE='' +HAVE_PYCAFE_EXT__TRUE='#' +HAVE_PYTHON__FALSE='' +HAVE_PYTHON__TRUE='#' HAVE_ZEROMQ__FALSE='' HAVE_ZEROMQ__TRUE='#' INSTALL_DATA='${INSTALL} -m 644' @@ -741,9 +754,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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib' +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 ' LIBOBJS='' -LIBS='-lpython3.10 ' +LIBS='-lQt5Xml -lQt5Core ' LIBTOOL='$(SHELL) $(top_builddir)/libtool' LIPO='' LN_S='ln -s' @@ -761,19 +774,19 @@ OTOOL='' PACKAGE='cafe' PACKAGE_BUGREPORT='Bug reports to: jan.chrin@psi.ch' PACKAGE_NAME='CAFE' -PACKAGE_STRING='CAFE 1.19.3' +PACKAGE_STRING='CAFE 1.20.1' PACKAGE_TARNAME='cafe' PACKAGE_URL='' -PACKAGE_VERSION='1.19.3' +PACKAGE_VERSION='1.20.1' PATH_SEPARATOR=':' RANLIB='ranlib' SED='/usr/bin/sed' SET_MAKE='' SHELL='/bin/sh' STRIP='strip' -VERSION='1.19.3' +VERSION='1.20.1' ac_ct_AR='ar' -ac_ct_CC='/opt/psi/Programming/gcc/7.5.0/bin/gcc' +ac_ct_CC='/opt/psi/Programming/gcc/10.4.0/bin/gcc' ac_ct_CXX='' ac_ct_DUMPBIN='' am__EXEEXT_FALSE='' @@ -809,7 +822,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.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64' +libdir='/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64' libexecdir='${exec_prefix}/libexec' localedir='${datarootdir}/locale' localstatedir='${prefix}/var' @@ -817,7 +830,7 @@ mandir='${datarootdir}/man' mkdir_p='$(MKDIR_P)' oldincludedir='/usr/include' pdfdir='${docdir}' -prefix='/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0' +prefix='/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0' program_transform_name='s,x,x,' psdir='${docdir}' sbindir='${exec_prefix}/sbin' @@ -832,12 +845,12 @@ target_alias='' /* confdefs.h */ #define PACKAGE_NAME "CAFE" #define PACKAGE_TARNAME "cafe" -#define PACKAGE_VERSION "1.19.3" -#define PACKAGE_STRING "CAFE 1.19.3" +#define PACKAGE_VERSION "1.20.1" +#define PACKAGE_STRING "CAFE 1.20.1" #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch" #define PACKAGE_URL "" #define PACKAGE "cafe" -#define VERSION "1.19.3" +#define VERSION "1.20.1" #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 @@ -859,9 +872,11 @@ target_alias='' #define EPICS_PATCH 7 #define HAVE_MULTI_INDEX_CONTAINER_HPP 1 #define HAVE_BOOST 1 -#define HAVE_PYTHON_H 1 -#define HAVE_LIBPYTHON3_10 1 -#define HAVE_PYTHON 1 -#define HAVE_PYCAFE_EXT 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 diff --git a/config.status b/config.status index 32d3b99..5cff673 100755 --- a/config.status +++ b/config.status @@ -380,7 +380,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by CAFE $as_me 1.19.3, which was +This file was extended by CAFE $as_me 1.20.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -427,9 +427,9 @@ $config_commands Report bugs to ." -ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-python310' '--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/7.5.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.5.0/bin/gcc'" +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_version="\ -CAFE config.status 1.19.3 +CAFE config.status 1.20.1 configured by ./configure, generated by GNU Autoconf 2.69, with options \"$ac_cs_config\" @@ -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.19.3-py310-gcc-7.5.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-python310' '--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/7.5.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.5.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion + 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 shift $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 CONFIG_SHELL='/bin/sh' @@ -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.5.0/bin/gcc' +CC='/opt/psi/Programming/gcc/10.4.0/bin/gcc' CFLAGS='-g -O2' -compiler='/opt/psi/Programming/gcc/7.5.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'\''' @@ -678,7 +678,7 @@ 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.5.0/lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib /lib /usr/lib ' +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/ ' configure_time_lt_sys_library_path='' hardcode_action='immediate' @@ -697,7 +697,7 @@ LD_CXX='/usr/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.5.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.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64/../lib64 /opt/psi/Programming/gcc/7.5.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.5.0/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../..' -predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtbeginS.o' -postdep_objects_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtendS.o /lib/../lib64/crtn.o' +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' 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.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.5.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib64 -L/opt/psi/Programming/gcc/7.5.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../..' +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/../../..' -LTCC='/opt/psi/Programming/gcc/7.5.0/bin/gcc' +LTCC='/opt/psi/Programming/gcc/10.4.0/bin/gcc' LTCFLAGS='-g -O2' -compiler='/opt/psi/Programming/gcc/7.5.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 () @@ -788,7 +788,7 @@ fi PACKAGE='cafe' - VERSION='1.19.3' + VERSION='1.20.1' RM='rm -f' ofile='libtool' @@ -879,18 +879,18 @@ 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.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpat"\ -"h,/opt/gfa/python-3.10/latest/lib" -S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -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/i"\ -"nclude/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.10/latest/includ"\ -"e/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include" +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["CAFE_CPPFLAGS"]="-I$(top_srcdir)/include " -S["CXXCPP"]="/opt/psi/Programming/gcc/7.5.0/bin/g++ -E" -S["CPP"]="/opt/psi/Programming/gcc/7.5.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"]="" @@ -915,9 +915,9 @@ S["SED"]="/usr/bin/sed" S["am__fastdepCC_FALSE"]="#" S["am__fastdepCC_TRUE"]="" S["CCDEPMODE"]="depmode=gcc3" -S["ac_ct_CC"]="/opt/psi/Programming/gcc/7.5.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.5.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" @@ -939,13 +939,13 @@ S["DEPDIR"]=".deps" S["OBJEXT"]="o" S["EXEEXT"]="" S["ac_ct_CXX"]="" -S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -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/i"\ -"nclude/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.10/latest/includ"\ -"e/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include" -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.10/latest/lib -Wl,-rpat"\ -"h,/opt/gfa/python-3.10/latest/lib" +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["CXXFLAGS"]="-g -O2" -S["CXX"]="/opt/psi/Programming/gcc/7.5.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)" @@ -966,7 +966,7 @@ S["AUTOHEADER"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoh S["AUTOMAKE"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16" S["AUTOCONF"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf" S["ACLOCAL"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16" -S["VERSION"]="1.19.3" +S["VERSION"]="1.20.1" S["PACKAGE"]="cafe" S["CYGPATH_W"]="echo" S["am__isrc"]="" @@ -976,14 +976,14 @@ S["INSTALL_PROGRAM"]="${INSTALL}" S["target_alias"]="" S["host_alias"]="" S["build_alias"]="" -S["LIBS"]="-lpython3.10 " +S["LIBS"]="-lQt5Xml -lQt5Core " 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.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64" +S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64" S["psdir"]="${docdir}" S["pdfdir"]="${docdir}" S["dvidir"]="${docdir}" @@ -1001,12 +1001,12 @@ 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.19.3-py310-gcc-7.5.0" +S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0" S["exec_prefix"]="${prefix}" S["PACKAGE_URL"]="" S["PACKAGE_BUGREPORT"]="Bug reports to: jan.chrin@psi.ch" -S["PACKAGE_STRING"]="CAFE 1.19.3" -S["PACKAGE_VERSION"]="1.19.3" +S["PACKAGE_STRING"]="CAFE 1.20.1" +S["PACKAGE_VERSION"]="1.20.1" S["PACKAGE_TARNAME"]="cafe" S["PACKAGE_NAME"]="CAFE" S["PATH_SEPARATOR"]=":" @@ -1055,12 +1055,12 @@ cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { D["PACKAGE_NAME"]=" \"CAFE\"" D["PACKAGE_TARNAME"]=" \"cafe\"" -D["PACKAGE_VERSION"]=" \"1.19.3\"" -D["PACKAGE_STRING"]=" \"CAFE 1.19.3\"" +D["PACKAGE_VERSION"]=" \"1.20.1\"" +D["PACKAGE_STRING"]=" \"CAFE 1.20.1\"" D["PACKAGE_BUGREPORT"]=" \"Bug reports to: jan.chrin@psi.ch\"" D["PACKAGE_URL"]=" \"\"" D["PACKAGE"]=" \"cafe\"" -D["VERSION"]=" \"1.19.3\"" +D["VERSION"]=" \"1.20.1\"" D["STDC_HEADERS"]=" 1" D["HAVE_SYS_TYPES_H"]=" 1" D["HAVE_SYS_STAT_H"]=" 1" @@ -1082,10 +1082,12 @@ D["EPICS_MINOR"]=" 0" D["EPICS_PATCH"]=" 7" D["HAVE_MULTI_INDEX_CONTAINER_HPP"]=" 1" D["HAVE_BOOST"]=" 1" -D["HAVE_PYTHON_H"]=" 1" -D["HAVE_LIBPYTHON3_10"]=" 1" -D["HAVE_PYTHON"]=" 1" -D["HAVE_PYCAFE_EXT"]=" 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 = "" } diff --git a/configurePSI.ac b/configurePSI.ac index 3cdfbc4..e376832 100644 --- a/configurePSI.ac +++ b/configurePSI.ac @@ -9,7 +9,7 @@ # Standard macros AC_PREREQ(2.63) AC_COPYRIGHT([CAFE, Jan Chrin, PSI, 2010-2023]) -AC_INIT([CAFE], [1.19.3], [Bug reports to: jan.chrin@psi.ch]) +AC_INIT([CAFE], [1.20.1], [Bug reports to: jan.chrin@psi.ch]) AC_CONFIG_AUX_DIR(./) @@ -38,7 +38,8 @@ AC_LANG([C++]) AC_DEFINE_UNQUOTED(HAVE_LINUX, 1, [linux dependency (sleep)]) -CPPFLAGS=" -fexceptions -fPIC -std=c++1z" +#-z nodefs suppress unresolöved symbols +CPPFLAGS=" -fexceptions -fPIC -std=c++1z -z nodefs" # provide include directories AC_SUBST([CAFE_CPPFLAGS], '-I$(top_srcdir)/include ') diff --git a/examples/cafeTest/RHEL8-x86_64/cafeTest b/examples/cafeTest/RHEL8-x86_64/cafeTest new file mode 100755 index 0000000..b7614fe Binary files /dev/null and b/examples/cafeTest/RHEL8-x86_64/cafeTest differ diff --git a/examples/cafeTest/RHEL8-x86_64/monitorTest b/examples/cafeTest/RHEL8-x86_64/monitorTest new file mode 100755 index 0000000..8a783bc Binary files /dev/null and b/examples/cafeTest/RHEL8-x86_64/monitorTest differ diff --git a/examples/cafeTest/cafeTest b/examples/cafeTest/cafeTest index da9265d..b7614fe 100755 Binary files a/examples/cafeTest/cafeTest and b/examples/cafeTest/cafeTest differ diff --git a/examples/cafeTest/makefile7 b/examples/cafeTest/makefile7 index 035e5e9..71e22fb 100644 --- a/examples/cafeTest/makefile7 +++ b/examples/cafeTest/makefile7 @@ -8,13 +8,13 @@ #-py37- libcafe.so: undefined reference to `cy_event_handler_wrapper #CAFE version to link to #CAFE_VERSION=cafe-1.14.4-sls2-gcc-7.3.0 -CAFE_VERSION=cafe-1.19.1-gcc-7.3.0 +CAFE_VERSION=cafe-1.20.1-py37-gcc-8.5.0 #CAFE_VERSION=cafe-1.15.0-gcc-10.3.0 PYTHON_INCLUDE=/opt/gfa/python-3.7/latest/include/python3.7m PYTHON_LIB=/opt/gfa/python-3.7/latest/lib -EPICS_BASE=${EPICS}/base-7.0.6 +EPICS_BASE=${EPICS}/base-7.0.7 #CAFE project base CAFE_BASE=/opt/gfa/cafe @@ -43,10 +43,10 @@ ${EPICS_HOST_ARCH}/monitorTest: monitorTest.cc g++ monitorTest.cc -o ${EPICS_HOST_ARCH}/monitorTest \ $(INCLUDE_PATH) $(LIB_DIR) $(LIBS) -cafeTest: cafeTest.cc callbacks.h - g++ cafeTest.cc -o cafeTest \ +${EPICS_HOST_ARCH}/cafeTest: cafeTest.cc callbacks.h + g++ cafeTest.cc -o ${EPICS_HOST_ARCH}/cafeTest \ $(INCLUDE_PATH) $(LIB_DIR) $(LIBS) clean: - rm -f cafeTest.o cafeTest + rm -f ${EPICS_HOST_ARCH}/cafeTest.o ${EPICS_HOST_ARCH}/cafeTest ${EPICS_HOST_ARCH}/monitorTest.o ${EPICS_HOST_ARCH}/monitorTest diff --git a/include/config.h b/include/config.h index 03dcdba..3097cd9 100644 --- a/include/config.h +++ b/include/config.h @@ -57,7 +57,7 @@ /* #undef HAVE_LIBLZ4 */ /* Define to 1 if you have the `python3.10' library (-lpython3.10). */ -#define HAVE_LIBPYTHON3_10 1 +/* #undef HAVE_LIBPYTHON3_10 */ /* Define to 1 if you have the `python3.4m' library (-lpython3.4m). */ /* #undef HAVE_LIBPYTHON3_4M */ @@ -72,16 +72,16 @@ /* #undef HAVE_LIBPYTHON3_8 */ /* Define to 1 if you have the `Qt5Core' library (-lQt5Core). */ -/* #undef HAVE_LIBQT5CORE */ +#define HAVE_LIBQT5CORE 1 /* Define to 1 if you have the `Qt5Xml' library (-lQt5Xml). */ -/* #undef HAVE_LIBQT5XML */ +#define HAVE_LIBQT5XML 1 /* Define to 1 if you have the `QtCore' library (-lQtCore). */ /* #undef HAVE_LIBQTCORE */ /* Availability of Qt version 5 confirmed */ -/* #undef HAVE_LIBQTXML */ +#define HAVE_LIBQTXML 1 /* 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 header file. */ -#define HAVE_PYTHON_H 1 +/* #undef HAVE_PYTHON_H */ /* Availability of Qt version 5 confirmed */ -/* #undef HAVE_QT */ +#define HAVE_QT 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_QXML_H */ +#define HAVE_QXML_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -156,7 +156,7 @@ #define PACKAGE_NAME "CAFE" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "CAFE 1.19.3" +#define PACKAGE_STRING "CAFE 1.20.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "cafe" @@ -165,13 +165,13 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.19.3" +#define PACKAGE_VERSION "1.20.1" /* Availability of Qt version 5 confirmed */ -/* #undef QT_NO_VERSION_TAGGING */ +#define QT_NO_VERSION_TAGGING 1 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.19.3" +#define VERSION "1.20.1" diff --git a/include/connect.h b/include/connect.h index d0776d5..735ff42 100644 --- a/include/connect.h +++ b/include/connect.h @@ -694,10 +694,15 @@ public: { cafeConduit_set_by_handle & handle_index=cs.get(); cafeConduit_set_by_handle::iterator it_handle; + it_handle = handle_index.find(handle); + if (it_handle != handle_index.end()) { - return (*it_handle).isConnected(); + //cafeMutex.lock(); + bool isConnected = (*it_handle).isConnected(); + //cafeMutex.unlock(); + return isConnected; } else { diff --git a/include/global.h b/include/global.h index 5978747..d79a2de 100644 --- a/include/global.h +++ b/include/global.h @@ -9,14 +9,14 @@ #ifndef GLOBAL_H #define GLOBAL_H -#include -#include -#include +//include +//include +//#include #include #include #include #include -#include +//#include extern bool CHECK_CONSISTENCY_CA_STATE; extern bool MUTEX; diff --git a/include/makefile b/include/makefile index 032055b..6aa4c45 100644 --- 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/gitlab/CAFE/cpp/missing aclocal-1.16 AMTAR = $${TAR-tar} -AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include +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_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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib +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 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 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16 AWK = gawk CAFE_CPPFLAGS = -I$(top_srcdir)/include -CC = /opt/psi/Programming/gcc/7.5.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.5.0/bin/gcc -E -CPPFLAGS = -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++ -CXXCPP = /opt/psi/Programming/gcc/7.5.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.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 +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 @@ -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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib +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 LIBOBJS = -LIBS = -lpython3.10 +LIBS = -lQt5Xml -lQt5Core LIBTOOL = $(SHELL) $(top_builddir)/libtool LIPO = LN_S = ln -s @@ -256,23 +256,23 @@ OTOOL64 = PACKAGE = cafe PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch PACKAGE_NAME = CAFE -PACKAGE_STRING = CAFE 1.19.3 +PACKAGE_STRING = CAFE 1.20.1 PACKAGE_TARNAME = cafe PACKAGE_URL = -PACKAGE_VERSION = 1.19.3 +PACKAGE_VERSION = 1.20.1 PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 1.19.3 +VERSION = 1.20.1 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp ac_ct_AR = ar -ac_ct_CC = /opt/psi/Programming/gcc/7.5.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/gitlab/CAFE/cpp/install-sh -libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64 +libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-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.19.3-py310-gcc-7.5.0 +prefix = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0 program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff --git a/libtool b/libtool index 98005cb..6404051 100755 --- a/libtool +++ b/libtool @@ -1,5 +1,5 @@ #! /bin/sh -# Generated automatically by config.status (cafe) 1.19.3 +# Generated automatically by config.status (cafe) 1.20.1 # Libtool was configured on host sf-lc8.psi.ch: # NOTE: Changes made to this file will be lost: look at ltmain.sh. @@ -162,7 +162,7 @@ old_postuninstall_cmds="" lock_old_archive_extraction=no # A C compiler. -LTCC="/opt/psi/Programming/gcc/7.5.0/bin/gcc" +LTCC="/opt/psi/Programming/gcc/10.4.0/bin/gcc" # LTCC compiler flags. LTCFLAGS="-g -O2" @@ -282,7 +282,7 @@ 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.5.0/lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib /lib /usr/lib " +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 " # 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/ " @@ -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.5.0/bin/gcc" +CC="/opt/psi/Programming/gcc/10.4.0/bin/gcc" # Is the compiler the GNU compiler? with_gcc=yes @@ -11673,7 +11673,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.5.0/bin/g++" +CC="/opt/psi/Programming/gcc/10.4.0/bin/g++" # Is the compiler the GNU compiler? with_gcc=yes @@ -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/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64/../lib64 /opt/psi/Programming/gcc/7.5.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.5.0/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../.." +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/../../.." # 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.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtbeginS.o" -postdep_objects="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtendS.o /lib/../lib64/crtn.o" +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" 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.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.5.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib64 -L/opt/psi/Programming/gcc/7.5.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../.." +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/../../.." # ### END LIBTOOL TAG CONFIG: CXX diff --git a/makefile b/makefile index 3a7304b..1f112e9 100644 --- a/makefile +++ b/makefile @@ -242,22 +242,22 @@ 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 -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -I$(top_srcdir)/include +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_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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib @CAFE_LIBS@ +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@ 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 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16 AWK = gawk CAFE_CPPFLAGS = -I$(top_srcdir)/include -CC = /opt/psi/Programming/gcc/7.5.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.5.0/bin/gcc -E -CPPFLAGS = -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++ -CXXCPP = /opt/psi/Programming/gcc/7.5.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.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 +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 @@ -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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib +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 LIBOBJS = -LIBS = -lpython3.10 +LIBS = -lQt5Xml -lQt5Core LIBTOOL = $(SHELL) $(top_builddir)/libtool LIPO = LN_S = ln -s @@ -299,23 +299,23 @@ OTOOL64 = PACKAGE = cafe PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch PACKAGE_NAME = CAFE -PACKAGE_STRING = CAFE 1.19.3 +PACKAGE_STRING = CAFE 1.20.1 PACKAGE_TARNAME = cafe PACKAGE_URL = -PACKAGE_VERSION = 1.19.3 +PACKAGE_VERSION = 1.20.1 PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 1.19.3 +VERSION = 1.20.1 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp ac_ct_AR = ar -ac_ct_CC = /opt/psi/Programming/gcc/7.5.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/gitlab/CAFE/cpp/install-sh -libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64 +libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-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.19.3-py310-gcc-7.5.0 +prefix = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0 program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff --git a/src/bitshuffle/.deps/bitshuffle.Plo b/src/bitshuffle/.deps/bitshuffle.Plo index 6848e18..a3acc63 100644 --- a/src/bitshuffle/.deps/bitshuffle.Plo +++ b/src/bitshuffle/.deps/bitshuffle.Plo @@ -4,7 +4,7 @@ bitshuffle/bitshuffle.lo: bitshuffle/bitshuffle.c \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/bits/long-double.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \ /usr/include/sys/types.h /usr/include/bits/types.h \ @@ -21,11 +21,11 @@ bitshuffle/bitshuffle.lo: bitshuffle/bitshuffle.c \ /usr/include/bits/pthreadtypes-arch.h /usr/include/alloca.h \ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ bitshuffle/bitshuffle_core.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdint.h \ /usr/include/stdint.h /usr/include/bits/wchar.h \ /usr/include/bits/stdint-uintn.h bitshuffle/bitshuffle_internals.h \ bitshuffle/iochain.h .././include/lz4.h /usr/include/stdio.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdarg.h \ /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \ /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \ /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \ @@ -54,7 +54,7 @@ bitshuffle/bitshuffle.h: /usr/include/gnu/stubs-64.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h: /usr/include/bits/waitflags.h: @@ -114,7 +114,7 @@ bitshuffle/bitshuffle.h: bitshuffle/bitshuffle_core.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdint.h: /usr/include/stdint.h: @@ -130,7 +130,7 @@ bitshuffle/iochain.h: /usr/include/stdio.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdarg.h: /usr/include/bits/types/__fpos_t.h: diff --git a/src/bitshuffle/.deps/bitshuffle_core.Plo b/src/bitshuffle/.deps/bitshuffle_core.Plo index 382ccf3..853c95a 100644 --- a/src/bitshuffle/.deps/bitshuffle_core.Plo +++ b/src/bitshuffle/.deps/bitshuffle_core.Plo @@ -1,6 +1,6 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \ /usr/include/stdc-predef.h bitshuffle/bitshuffle_core.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdint.h \ /usr/include/stdint.h /usr/include/bits/libc-header-start.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/bits/long-double.h \ @@ -8,7 +8,7 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/bits/wchar.h /usr/include/bits/stdint-intn.h \ /usr/include/bits/stdint-uintn.h /usr/include/stdlib.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \ /usr/include/sys/types.h /usr/include/bits/types/clock_t.h \ @@ -25,7 +25,7 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ bitshuffle/bitshuffle_internals.h bitshuffle/iochain.h \ /usr/include/stdio.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdarg.h \ /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \ /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \ /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \ @@ -33,16 +33,16 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \ /usr/include/bits/stdio.h /usr/include/string.h \ /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h \ /usr/include/strings.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mm_malloc.h + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/emmintrin.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/xmmintrin.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/mmintrin.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/mm_malloc.h /usr/include/stdc-predef.h: bitshuffle/bitshuffle_core.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdint.h: /usr/include/stdint.h: @@ -72,7 +72,7 @@ bitshuffle/bitshuffle_core.h: /usr/include/stdlib.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h: /usr/include/bits/waitflags.h: @@ -130,7 +130,7 @@ bitshuffle/iochain.h: /usr/include/stdio.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdarg.h: /usr/include/bits/types/__fpos_t.h: @@ -158,10 +158,10 @@ bitshuffle/iochain.h: /usr/include/strings.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/emmintrin.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/xmmintrin.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/mmintrin.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mm_malloc.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/mm_malloc.h: diff --git a/src/bitshuffle/.deps/iochain.Plo b/src/bitshuffle/.deps/iochain.Plo index c8ca6d6..f5690e5 100644 --- a/src/bitshuffle/.deps/iochain.Plo +++ b/src/bitshuffle/.deps/iochain.Plo @@ -3,7 +3,7 @@ bitshuffle/iochain.lo: bitshuffle/iochain.c /usr/include/stdc-predef.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \ + /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \ /usr/include/sys/types.h /usr/include/bits/types.h \ @@ -39,7 +39,7 @@ bitshuffle/iochain.lo: bitshuffle/iochain.c /usr/include/stdc-predef.h \ /usr/include/gnu/stubs-64.h: -/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h: +/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h: /usr/include/bits/waitflags.h: diff --git a/src/makefile b/src/makefile index 597b2b8..fb71ef8 100644 --- 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 -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -I$(top_srcdir)/include +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_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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib +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 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 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16 AWK = gawk CAFE_CPPFLAGS = -I$(top_srcdir)/include -CC = /opt/psi/Programming/gcc/7.5.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.5.0/bin/gcc -E -CPPFLAGS = -fexceptions -fPIC -std=c++1z -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.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++ -CXXCPP = /opt/psi/Programming/gcc/7.5.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.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 +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 @@ -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.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib +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 LIBOBJS = -LIBS = -lpython3.10 +LIBS = -lQt5Xml -lQt5Core LIBTOOL = $(SHELL) $(top_builddir)/libtool LIPO = LN_S = ln -s @@ -333,23 +333,23 @@ OTOOL64 = PACKAGE = cafe PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch PACKAGE_NAME = CAFE -PACKAGE_STRING = CAFE 1.19.3 +PACKAGE_STRING = CAFE 1.20.1 PACKAGE_TARNAME = cafe PACKAGE_URL = -PACKAGE_VERSION = 1.19.3 +PACKAGE_VERSION = 1.20.1 PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 1.19.3 +VERSION = 1.20.1 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp ac_ct_AR = ar -ac_ct_CC = /opt/psi/Programming/gcc/7.5.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/gitlab/CAFE/cpp/install-sh -libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64 +libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-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.19.3-py310-gcc-7.5.0 +prefix = /opt/gfa/cafe/cpp/cafe-1.20.1-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 20:3:19 +libcafe_la_LDFLAGS = -version-info 21:1:20 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp \ cafeVectors.cpp cafeXML.cpp callbackHandlerCreate.cpp \ callbackHandlerMonitor.cpp conduit.cpp connect.cpp \ diff --git a/src/makefile.am b/src/makefile.am index 1b4c63d..f45ae30 100644 --- 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 20:3:19 +libcafe_la_LDFLAGS = -version-info 21:1:20 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp cafeVectors.cpp cafeXML.cpp \ callbackHandlerCreate.cpp callbackHandlerMonitor.cpp conduit.cpp connect.cpp connectCallbacks.cpp \