From 4a442bb56c4e7da74b77a513bfa318e4b59958a4 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 18 Nov 2024 10:21:00 +0100 Subject: [PATCH] Support deb12-x86_64 --- configure/os/CONFIG.Common.deb12-x86_64 | 17 +++++++++++++++++ configure/os/CONFIG.deb12-x86_64.Common | 3 +++ configure/os/CONFIG.deb12-x86_64.deb12-x86_64 | 3 +++ configure/os/CONFIG_SITE.Common.deb12-x86_64 | 2 ++ configure/os/CONFIG_SITE.linux-x86_64.Common | 3 ++- 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 configure/os/CONFIG.Common.deb12-x86_64 create mode 100644 configure/os/CONFIG.deb12-x86_64.Common create mode 100644 configure/os/CONFIG.deb12-x86_64.deb12-x86_64 create mode 100644 configure/os/CONFIG_SITE.Common.deb12-x86_64 diff --git a/configure/os/CONFIG.Common.deb12-x86_64 b/configure/os/CONFIG.Common.deb12-x86_64 new file mode 100644 index 000000000..e3416cc13 --- /dev/null +++ b/configure/os/CONFIG.Common.deb12-x86_64 @@ -0,0 +1,17 @@ +# Debian 12 + +# Include definitions common to all Linux targets +include $(CONFIG)/os/CONFIG.Common.linux-x86_64 + +BUILD_CLASS = HOST + +STD_CXXFLAGS = -std=c++17 + +ifneq ($(EPICS_HOST_ARCH),$(T_A)) +# Cross compile +GNU_DIR = /opt/xgcc/gcc-12.2.0-deb12 +GNU_TARGET = x86_64-deb12-linux-gnu +SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root +CMPLR_PREFIX = $(GNU_TARGET)- +ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SYSROOT)/lib/x86_64-linux-gnu +endif diff --git a/configure/os/CONFIG.deb12-x86_64.Common b/configure/os/CONFIG.deb12-x86_64.Common new file mode 100644 index 000000000..26c65b727 --- /dev/null +++ b/configure/os/CONFIG.deb12-x86_64.Common @@ -0,0 +1,3 @@ +#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system +#Include definitions common to linux hosts +include $(CONFIG)/os/CONFIG.linux-x86_64.Common diff --git a/configure/os/CONFIG.deb12-x86_64.deb12-x86_64 b/configure/os/CONFIG.deb12-x86_64.deb12-x86_64 new file mode 100644 index 000000000..f6983dd33 --- /dev/null +++ b/configure/os/CONFIG.deb12-x86_64.deb12-x86_64 @@ -0,0 +1,3 @@ +# Include common linux definitions +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 +GNU_DIR=/usr diff --git a/configure/os/CONFIG_SITE.Common.deb12-x86_64 b/configure/os/CONFIG_SITE.Common.deb12-x86_64 new file mode 100644 index 000000000..d0a57750f --- /dev/null +++ b/configure/os/CONFIG_SITE.Common.deb12-x86_64 @@ -0,0 +1,2 @@ +# Debian 10 +COMMANDLINE_LIBRARY=READLINE diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common index 5f5ccc26b..753e6b610 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.Common +++ b/configure/os/CONFIG_SITE.linux-x86_64.Common @@ -21,8 +21,9 @@ CROSS_COMPILER_TARGET_ARCHS += windows-x64 #CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64 CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64 -# Debian 10 +# Debian CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64 +CROSS_COMPILER_TARGET_ARCHS += deb12-x86_64 # Newer DeltaTau PowerPMAC CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP