Skip to content

Add Linux support for non-system tirpc library #216

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

Open
jlmuir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Linux support for non-system tirpc library #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions asyn/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,16 @@ asyn_SYS_LIBS_WIN32 = ws2_32 winmm
asyn_SYS_LIBS_cygwin32 = $(CYGWIN_RPC_LIB)

# Some linux systems moved RPC related symbols to libtirpc
# Define TIRPC in configure/CONFIG_SITE in this case
# Set TIRPC* variables in configure/CONFIG_SITE in this case
ifeq ($(TIRPC),YES)
USR_INCLUDES_Linux += -I/usr/include/tirpc
asyn_SYS_LIBS_Linux += tirpc
ifdef TIRPC_LIB
USR_INCLUDES_Linux += -I$(TIRPC_INCLUDE)
tirpc_DIR = $(TIRPC_LIB)
asyn_LIBS_Linux += tirpc
else
USR_INCLUDES_Linux += -I/usr/include/tirpc
asyn_SYS_LIBS_Linux += tirpc
endif
endif

SRC_DIRS += $(ASYN)/asynDriver
Expand Down
6 changes: 6 additions & 0 deletions configure/CONFIG_SITE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ DRV_FTDI_USE_LIBFTDI1=NO
# To enable linking against this library, uncomment the following line
# TIRPC=YES

# If libtirpc on Linux is not installed in a system location, then uncomment
# and edit these lines to define the location of the include and lib
# directories
#TIRPC_INCLUDE=/usr/local/include/tirpc
#TIRPC_LIB=/usr/local/lib

-include $(SUPPORT)/configure/CONFIG_SITE

# These allow developers to override the CONFIG_SITE variable
Expand Down
10 changes: 8 additions & 2 deletions testGpibApp/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,14 @@ testGpibVx_SRCS_vxWorks += testGpibVx_registerRecordDeviceDriver.cpp
testGpib_LIBS += devTestGpib
testGpib_LIBS += testSupport asyn
ifeq ($(TIRPC),YES)
USR_INCLUDES += -I/usr/include/tirpc
testGpib_SYS_LIBS += tirpc
ifdef TIRPC_LIB
USR_INCLUDES += -I$(TIRPC_INCLUDE)
tirpc_DIR = $(TIRPC_LIB)
testGpib_LIBS += tirpc
else
USR_INCLUDES += -I/usr/include/tirpc
testGpib_SYS_LIBS += tirpc
endif
endif
SYS_PROD_LIBS_cygwin32 += $(CYGWIN_RPC_LIB)
testGpib_LIBS += $(EPICS_BASE_IOC_LIBS)
Expand Down