diff --git a/.ci-local/deps-latest.set b/.ci-local/deps-latest.set index 4a2a26378..68050dcea 100644 --- a/.ci-local/deps-latest.set +++ b/.ci-local/deps-latest.set @@ -1,8 +1,7 @@ -MODULES="sncseq sscan calc ipac" +MODULES="sscan calc ipac" BASE_RECURSIVE=no -SNCSEQ=master SSCAN=master CALC=master IPAC=master diff --git a/.ci-local/deps1.set b/.ci-local/deps1.set index 34dc30a23..8505184aa 100644 --- a/.ci-local/deps1.set +++ b/.ci-local/deps1.set @@ -1,8 +1,7 @@ -MODULES="sncseq sscan calc ipac" +MODULES="sscan calc ipac" BASE_RECURSIVE=no -SNCSEQ=R2-2-8 SSCAN=R2-11-3 CALC=R3-7-3 IPAC=2.15 diff --git a/.ci-local/deps2.set b/.ci-local/deps2.set index 6f0fcae98..b490c36d3 100644 --- a/.ci-local/deps2.set +++ b/.ci-local/deps2.set @@ -1,8 +1,7 @@ -MODULES="sncseq sscan calc ipac" +MODULES="sscan calc ipac" BASE_RECURSIVE=no -SNCSEQ=R2-2-8 SSCAN=R2-11-5 CALC=R3-7-4 IPAC=2.16 diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index fb4356dc1..d5aaa74c8 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -108,9 +108,6 @@ jobs: - name: Prepare and compile EPICS dependencies run: python .ci/cue.py prepare - - name: TIRPC - run: echo TIRPC=YES > configure/CONFIG_SITE.Common.linux-x86_64 - - name: Build main module run: python .ci/cue.py build diff --git a/configure/CONFIG_ASYN_MODULE b/configure/CONFIG_ASYN_MODULE new file mode 100644 index 000000000..a65ac8c76 --- /dev/null +++ b/configure/CONFIG_ASYN_MODULE @@ -0,0 +1,14 @@ + +ifdef T_A +ifneq (,$(filter linux-%,$(T_A))) +ifeq ($(EPICS_HOST_ARCH),$(T_A)) + +ifneq (,$(firstword $(wildcard /usr/include/tirpc/rpc/rpc.h))) + +TIRPC ?= YES + +endif + +endif +endif +endif diff --git a/configure/Makefile b/configure/Makefile index 925430940..146b708da 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -5,4 +5,6 @@ include $(TOP)/configure/CONFIG TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) +CFG += CONFIG_ASYN_MODULE + include $(TOP)/configure/RULES