From 109afb030e1262026c04d1906bef879cf22dd3c0 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Wed, 13 Oct 2021 14:47:54 +0200
Subject: [PATCH] Removed references to startup/EpicsHostArch
---
configure/E3/CONFIG_EXPORT | 6 ------
configure/modules/CONFIG_EXPORT | 6 ------
require-ess/tools/setE3Env.bash | 7 +------
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/configure/E3/CONFIG_EXPORT b/configure/E3/CONFIG_EXPORT
index e5ab2181..6aeb4e9b 100644
--- a/configure/E3/CONFIG_EXPORT
+++ b/configure/E3/CONFIG_EXPORT
@@ -1,12 +1,6 @@
# Variables should be transferred to module_name.makefile
-EPICS_HOST_ARCH:=$(shell $(EPICS_BASE)/startup/EpicsHostArch.pl 2> /dev/null)
-
-# In near future, BASE may drop "startup" directory, so
-# Note that the following line is not the same as e3-base, CONFIG_EXPORT
-ifeq ($(strip $(EPICS_HOST_ARCH)),)
EPICS_HOST_ARCH:=$(shell perl $(EPICS_BASE)/lib/perl/EpicsHostArch.pl 2> /dev/null)
-endif
MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi
diff --git a/configure/modules/CONFIG_EXPORT b/configure/modules/CONFIG_EXPORT
index 8ed09578..6d5b6609 100644
--- a/configure/modules/CONFIG_EXPORT
+++ b/configure/modules/CONFIG_EXPORT
@@ -1,12 +1,6 @@
# Variables should be transferred to module_name.makefile
-EPICS_HOST_ARCH:=$(shell $(EPICS_BASE)/startup/EpicsHostArch.pl 2> /dev/null)
-
-# In near future, BASE may drop "startup" directory, so
-# Note that the following line is not the same as e3-base, CONFIG_EXPORT
-ifeq ($(strip $(EPICS_HOST_ARCH)),)
EPICS_HOST_ARCH:=$(shell perl $(EPICS_BASE)/lib/perl/EpicsHostArch.pl 2> /dev/null)
-endif
MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi
diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/setE3Env.bash
index d8294f4a..6cd4127b 100644
--- a/require-ess/tools/setE3Env.bash
+++ b/require-ess/tools/setE3Env.bash
@@ -214,12 +214,7 @@ else
fi
-epics_host_arch_file="${EPICS_BASE}/startup/EpicsHostArch.pl"
-if [ -e "$epics_host_arch_file" ]; then
- EPICS_HOST_ARCH=$("${EPICS_BASE}/startup/EpicsHostArch.pl")
-else
- EPICS_HOST_ARCH=$(perl "${EPICS_BASE}"/lib/perl/EpicsHostArch.pl)
-fi
+EPICS_HOST_ARCH=$(perl "${EPICS_BASE}"/lib/perl/EpicsHostArch.pl)
E3_REQUIRE_BIN=${E3_REQUIRE_LOCATION}/bin
E3_REQUIRE_LIB=${E3_REQUIRE_LOCATION}/lib
--
GitLab