add pvxs for architectures that support libevent natively
This commit is contained in:
1 parent
a61ed8eab3
commit
3b04f8176a
17 files changed
+56
-7
No files matched your search
@@ -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
|
||||
@@ -1,2 +1,5 @@
|
||||
RTEMS_VERSION = 5
|
||||
include $(CONFIG)/os/CONFIG.Common.RTEMS-pc686
|
||||
|
||||
# no libevent
|
||||
SKIP_BUILDS += pvxs
|
||||
@@ -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
|
||||
@@ -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)
|
||||
|
||||
@@ -15,3 +15,4 @@ GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
|
||||
|
||||
# have no full C++11
|
||||
STD_CXXFLAGS = -std=c++0x
|
||||
SKIP_BUILDS += pvxs
|
||||
@@ -16,3 +16,4 @@ GNU_TARGET_INCLUDE_DIR =
|
||||
|
||||
# have no full C++11
|
||||
STD_CXXFLAGS = -std=c++0x
|
||||
SKIP_BUILDS += pvxs
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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=
|
||||
@@ -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
|
||||
+16
-6
@@ -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
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
SUBMODULES += pcas
|
||||
pcas_DEPEND_DIRS = libcom ca
|
||||
SUBMODULES += pvxs
|
||||
pvxs_DEPEND_DIRS = database
|
||||
Submodule
+1
Submodule modules/pvxs added at 3b8f5d1097.
Reference in new issue
Block a user