Skip to content

Attempt to auto-detect TIRPC=YES #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mdavidsaver wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Attempt to auto-detect TIRPC=YES #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b600c42
auto-detect tirpc on Linux
mdavidsaver Jun 23, 2023
fadbff8
GHA: drop sequencer
mdavidsaver Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .ci-local/deps-latest.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
MODULES="sncseq sscan calc ipac"
MODULES="sscan calc ipac"

BASE_RECURSIVE=no

SNCSEQ=master
SSCAN=master
CALC=master
IPAC=master
3 changes: 1 addition & 2 deletions .ci-local/deps1.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions .ci-local/deps2.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions .github/workflows/ci-scripts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 14 additions & 0 deletions configure/CONFIG_ASYN_MODULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions configure/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ include $(TOP)/configure/CONFIG
TARGETS = $(CONFIG_TARGETS)
CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))

CFG += CONFIG_ASYN_MODULE

include $(TOP)/configure/RULES