diff --git a/.gitmodules b/.gitmodules index 769c86cf3..e77308deb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,3 +29,6 @@ [submodule "modules/pcas"] path = modules/pcas url = https://gitea.psi.ch/epics/pcas +[submodule "modules/pvxs"] + path = modules/pvxs + url = gitea.psi.ch:epics/pvxs.git diff --git a/configure/os/CONFIG.Common.RTEMS51-pc686 b/configure/os/CONFIG.Common.RTEMS51-pc686 index 8f58e6c9a..feaf1b6b0 100644 --- a/configure/os/CONFIG.Common.RTEMS51-pc686 +++ b/configure/os/CONFIG.Common.RTEMS51-pc686 @@ -1,2 +1,5 @@ RTEMS_VERSION = 5 include $(CONFIG)/os/CONFIG.Common.RTEMS-pc686 + +# no libevent +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Common.deb10-x86_64 b/configure/os/CONFIG.Common.deb10-x86_64 index 74d423e8f..34c63a6c6 100644 --- a/configure/os/CONFIG.Common.deb10-x86_64 +++ b/configure/os/CONFIG.Common.deb10-x86_64 @@ -14,3 +14,6 @@ GNU_TARGET = x86_64-deb10-linux-gnu SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root CMPLR_PREFIX = $(GNU_TARGET)- endif + +# no libevent +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Common.eldk42-ppc4xxFP b/configure/os/CONFIG.Common.eldk42-ppc4xxFP index 00a1f24b6..257e8ce5d 100644 --- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP +++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP @@ -16,10 +16,10 @@ ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib # have no C++11 STD_CXXFLAGS = +SKIP_BUILDS += pvxs # suppress strict alias warnings CODE_CPPFLAGS += -fno-strict-aliasing # We may need to wrap the 32 bit compiler LOADER = $(WRAP32BIT) - diff --git a/configure/os/CONFIG.Common.eldk51-ppc4xxSF b/configure/os/CONFIG.Common.eldk51-ppc4xxSF index d082030d2..50b078b71 100644 --- a/configure/os/CONFIG.Common.eldk51-ppc4xxSF +++ b/configure/os/CONFIG.Common.eldk51-ppc4xxSF @@ -15,3 +15,4 @@ GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH) # have no full C++11 STD_CXXFLAGS = -std=c++0x +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Common.eldk52-e500v2 b/configure/os/CONFIG.Common.eldk52-e500v2 index be9799ed7..dd002ae86 100644 --- a/configure/os/CONFIG.Common.eldk52-e500v2 +++ b/configure/os/CONFIG.Common.eldk52-e500v2 @@ -16,3 +16,4 @@ GNU_TARGET_INCLUDE_DIR = # have no full C++11 STD_CXXFLAGS = -std=c++0x +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Common.eldk53-ppc4xxFP b/configure/os/CONFIG.Common.eldk53-ppc4xxFP index b6253e6c0..f8b41ba3c 100644 --- a/configure/os/CONFIG.Common.eldk53-ppc4xxFP +++ b/configure/os/CONFIG.Common.eldk53-ppc4xxFP @@ -18,3 +18,6 @@ SYSROOT = $(SDKTARGETSYSROOT)/$(GNU_ARCH) ARCH_DEP_CPPFLAGS = -m32 -mcpu=440fp -mhard-float AS=$(GNU_BIN)/$(GNU_TARGET)-as + +# insufficient C++ version +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Common.gcc8-ppc4xxFP b/configure/os/CONFIG.Common.gcc8-ppc4xxFP index 9f321764f..96be175bd 100644 --- a/configure/os/CONFIG.Common.gcc8-ppc4xxFP +++ b/configure/os/CONFIG.Common.gcc8-ppc4xxFP @@ -12,3 +12,6 @@ ARCH_DEP_CPPFLAGS = -m32 -mcpu=440fp -mhard-float ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(GNU_DIR)/$(GNU_TARGET)/sys-root/lib/powerpc-linux-gnu STD_CXXFLAGS = -std=c++17 + +# no libevent +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Common.moxa42-armv6l b/configure/os/CONFIG.Common.moxa42-armv6l index 52b378dbc..504c2358e 100644 --- a/configure/os/CONFIG.Common.moxa42-armv6l +++ b/configure/os/CONFIG.Common.moxa42-armv6l @@ -27,3 +27,5 @@ osdSock_CFLAGS += -D__rtems__ # We may need to wrap the 32 bit compiler LOADER = $(WRAP32BIT) +# no libevent and no proper c++11 +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Common.nilrt7-armv7a b/configure/os/CONFIG.Common.nilrt7-armv7a index e35d1dbbf..9ed51ffd5 100644 --- a/configure/os/CONFIG.Common.nilrt7-armv7a +++ b/configure/os/CONFIG.Common.nilrt7-armv7a @@ -19,3 +19,6 @@ ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2 COMMANDLINE_LIBRARY = READLINE_NCURSES + +# no libevent +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Common.raspbian-arm b/configure/os/CONFIG.Common.raspbian-arm index 7de49bc67..5ee37b23c 100644 --- a/configure/os/CONFIG.Common.raspbian-arm +++ b/configure/os/CONFIG.Common.raspbian-arm @@ -42,3 +42,6 @@ SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64 GNU_DIR = $(SDK_DIR)/$(SDK_TARGET) GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf) + +# no libevent +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG.Linux.windows-x64 b/configure/os/CONFIG.Linux.windows-x64 index edbbf8758..7458bf3a6 100644 --- a/configure/os/CONFIG.Linux.windows-x64 +++ b/configure/os/CONFIG.Linux.windows-x64 @@ -9,3 +9,6 @@ export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH) export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%) export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%) export WINEPATH := $(WINEPATH:%=%;)$(abspath $(INSTALL_BIN)) + +# no libevent +SKIP_BUILDS += pvxs diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index d8c6ba51c..d993ecac7 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -34,3 +34,8 @@ softIocPVA_LDFLAGS += -whole-archive # We may need to wrap the 32 bit compiler LOADER = $(WRAP32BIT) +# Cannot build PVXS with old VxWorks compilers +SKIP_BUILDS += pvxs + +# Still pvxs builds TOOLCHAIN and wrongly uses OP_SYS_INCLUDE_CPPFLAGS +TOOLCHAIN: OP_SYS_INCLUDE_CPPFLAGS= diff --git a/configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw b/configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw index 169e0f57c..7f0d65a48 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw +++ b/configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw @@ -12,3 +12,6 @@ export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH) export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%) export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%) export WINEPATH := $(WINEPATH:%=%;)$(MINGWLIBS);$(abspath $(INSTALL_BIN)) + +# no libevent +SKIP_BUILDS += pvxs diff --git a/epics-base.spec b/epics-base.spec index 1d56aff28..f3c8081cd 100644 --- a/epics-base.spec +++ b/epics-base.spec @@ -5,7 +5,7 @@ Name: epics-base-%{EpicsVersion} Summary: EPICS Base %{EpicsVersion} Version: 1 -Release: 2%{?dist} +Release: 3%{?dist} License: EPICS Open License Group: Development/Languages URL: https://git.psi.ch/epics_base/base-7.0 @@ -77,6 +77,10 @@ Requires: perl-Sys-Hostname perl-Test perl-Test-Simple # It does not find all EPICS internal packages %global __requires_exclude_from ^%{prog_folder}/bin/.*\\.pl$ +# Need libevent for pvxs +Requires: libevent +BuildRequires: libevent-devel + %description host-devel Contains headers etc to build EPICS host applications. @@ -218,7 +222,7 @@ ls /opt/RHEL9 > /dev/null # remove files we do not need shopt -s extglob -%{__rm} -f %{buildroot}%{prog_folder}/bin/{V,RTEMS}*/{*Harness,softIoc,softIocPVA} +%{__rm} -f %{buildroot}%{prog_folder}/bin/{V,RTEMS}*/{*Harness,softIoc,softIocPVA,softIocPVX} %{__rm} -f %{buildroot}%{prog_folder}/bin/RTEMS*/TEMP.* # fix permissions of caRepeater.service @@ -259,7 +263,7 @@ then fi %postun -[ "$1" -eq 0 ] || exit +[ "$1" -eq 0 ] || exit 0 shopt -s extglob %{__rm} -f /etc/profile.d/epics-base.sh %{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/epics-base.sh 2>/dev/null | /usr/bin/head -n1)" /etc/profile.d/ 2>/dev/null @@ -425,13 +429,17 @@ fi %{prog_folder}/include/os/WIN32/ %{prog_folder}/include/pv/ %{prog_folder}/include/pva/ +%{prog_folder}/include/pvxs/ %{prog_folder}/include/valgrind/ %{prog_folder}/include/flex.skel.static %{prog_folder}/templates %dir %{prog_folder}/cfg %{prog_folder}/cfg/CONFIG* +%{prog_folder}/cfg/RULES* %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.%{epics_host_arch}* %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.win* +%{prog_folder}/cfg/TOOLCHAIN_*.%{epics_host_arch}* +%{prog_folder}/cfg/TOOLCHAIN_*.win* %dir %{prog_folder}/configure %{prog_folder}/configure/RELEASE %{prog_folder}/configure/CONFIG* @@ -471,9 +479,11 @@ fi %defattr(-,root,root,-) %{prog_folder}/include/os/vxWorks/ %{prog_folder}/include/os/RTEMS/ -%exclude %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.%{epics_host_arch}* -%exclude %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.win* -%{prog_folder}/cfg/TOOLCHAIN.* +%exclude %{prog_folder}/cfg/TOOLCHAIN*.%{epics_host_arch}*.%{epics_host_arch}* +%exclude %{prog_folder}/cfg/TOOLCHAIN*.%{epics_host_arch}*.win* +%exclude %{prog_folder}/cfg/TOOLCHAIN_*.%{epics_host_arch}* +%exclude %{prog_folder}/cfg/TOOLCHAIN_*.win* +%{prog_folder}/cfg/TOOLCHAIN* %exclude %{prog_folder}/configure/os/CONFIG.Common.%{epics_host_arch}* %exclude %{prog_folder}/configure/os/CONFIG.Common.UnixCommon %exclude %{prog_folder}/configure/os/CONFIG.Common.linuxCommon diff --git a/modules/Makefile.local b/modules/Makefile.local index d48450a14..a4001b997 100644 --- a/modules/Makefile.local +++ b/modules/Makefile.local @@ -1,2 +1,4 @@ SUBMODULES += pcas pcas_DEPEND_DIRS = libcom ca +SUBMODULES += pvxs +pvxs_DEPEND_DIRS = database diff --git a/modules/pvxs b/modules/pvxs new file mode 160000 index 000000000..3b8f5d109 --- /dev/null +++ b/modules/pvxs @@ -0,0 +1 @@ +Subproject commit 3b8f5d1097291b1461dc2cee4f7e30d6fc24fa4b