From cdb33e637da3892a913449b06abd3d820fbef665 Mon Sep 17 00:00:00 2001 From: jwlodek Date: Mon, 11 Aug 2025 16:37:44 -0400 Subject: [PATCH] Add option for overriding config site local --- configure/CONFIG_SITE | 2 ++ iocs/uvcIOC/configure/CONFIG_SITE | 2 ++ iocs/uvcIOC/configure/CONFIG_SITE.Common.linux-x86 | 6 ------ 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 iocs/uvcIOC/configure/CONFIG_SITE.Common.linux-x86 diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 4df968f..eef973b 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -40,3 +40,5 @@ ifdef T_A -include $(AREA_DETECTOR)/configure/CONFIG_SITE.Common.$(T_A) -include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) endif + +-include $(TOP)/configure/CONFIG_SITE.local diff --git a/iocs/uvcIOC/configure/CONFIG_SITE b/iocs/uvcIOC/configure/CONFIG_SITE index 4df968f..0faacd4 100644 --- a/iocs/uvcIOC/configure/CONFIG_SITE +++ b/iocs/uvcIOC/configure/CONFIG_SITE @@ -40,3 +40,5 @@ ifdef T_A -include $(AREA_DETECTOR)/configure/CONFIG_SITE.Common.$(T_A) -include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) endif + +-include $(TOP)/configure/CONFIG_SITE.local \ No newline at end of file diff --git a/iocs/uvcIOC/configure/CONFIG_SITE.Common.linux-x86 b/iocs/uvcIOC/configure/CONFIG_SITE.Common.linux-x86 deleted file mode 100644 index 69c8111..0000000 --- a/iocs/uvcIOC/configure/CONFIG_SITE.Common.linux-x86 +++ /dev/null @@ -1,6 +0,0 @@ -# There is a problem when building dynamically on our linux-x86 system, due to functions called in PvAPI.a. - -# These can be fixed either by building statically with this line: -#STATIC_BUILD=YES -# Or by building dynamically with this line: -PROD_SYS_LIBS += pthread rt