epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

use toolset 12 (fix in pvData sharedVector.h was needed) and bump up used C++ standards
Some checks failed
Base / CentOS-7 (push) Failing after 2s
Details
Base / Fedora-33 (push) Failing after 4s
Details
Base / Fedora-latest (push) Failing after 5s
Details
Base / Ub-20 clang-10 C++11 (push) Has been cancelled
Details
Base / MacOS clang-12 (push) Has been cancelled
Details
Base / Ub-20 clang-10 (push) Has been cancelled
Details
Base / Ub-20 gcc-9 + MinGW (push) Has been cancelled
Details
Base / Win2019 mingw (push) Has been cancelled
Details
Base / Ub-20 gcc-9 + RT-4.10 (push) Has been cancelled
Details
Base / Ub-20 gcc-9 + RT-4.9 (push) Has been cancelled
Details
Base / Ub-20 gcc-9 + RT-5.1 beatnik (push) Has been cancelled
Details
Base / Ub-20 gcc-9 + RT-5.1 uC5282 (push) Has been cancelled
Details
Base / Ub-20 gcc-9 + RT-5.1 pc686 (push) Has been cancelled
Details
Base / Ub-20 gcc-9 + RT-5.1 xilinx_zynq_a9_qemu (push) Has been cancelled
Details
Base / Ub-20 gcc-9 unsigned char (push) Has been cancelled
Details
Base / Ub-20 gcc-9 C++11, static (push) Has been cancelled
Details
Base / Ub-20 gcc-9 + MinGW, static (push) Has been cancelled
Details
Base / Win2019 MSC-19, debug (push) Has been cancelled
Details
Base / Win2019 MSC-19 (push) Has been cancelled
Details
Base / Win2019 MSC-19, static (push) Has been cancelled
Details

Browse Source
This commit is contained in:
zimoch
2023-02-15 17:09:38 +01:00
parent c578148e36
commit e9237ef4e8
9 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure/os/CONFIG.Common.RHEL7-x86_64
View File

@@ -2,5 +2,5 @@
include $(CONFIG)/os/CONFIG.Common.linux-x86_64
TOOLSET_LOCATION = /opt/rh
#TOOLSET = devtoolset-11
STD_CXXFLAGS = $(if $(TOOLSET),-std=c++17,-std=c++11)
TOOLSET = devtoolset-12
STD_CXXFLAGS = -std=c++20

4
configure/os/CONFIG.Common.RHEL8-x86_64
View File

@@ -2,8 +2,8 @@
include $(CONFIG)/os/CONFIG.Common.linux-x86_64
TOOLSET_LOCATION = /opt/rh
#TOOLSET = gcc-toolset-12
#STD_CXXFLAGS = -std=c++17
TOOLSET = gcc-toolset-12
STD_CXXFLAGS = -std=c++20
# Fix bug in gcc-toolset-11 calling the old assembler
ifneq ($(filter %-11,$(TOOLSET)),)

2
configure/os/CONFIG.Common.deb10-x86_64
View File

@@ -18,3 +18,5 @@ GNU_TARGET=x86_64-deb10-linux-gnu
ARCH_DEP_CPPFLAGS =
AS=$(GNU_BIN)/$(GNU_TARGET)-as
STD_CXXFLAGS = -std=c++17

1
configure/os/CONFIG.Common.nilrt7-armv7a
View File

@@ -8,6 +8,7 @@ ARCH_CLASS = arm
GNU_TARGET = arm-linux-gnu
SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
GNU_BIN = /bin
ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/

1
configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64
View File

@@ -10,7 +10,6 @@ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
# Optionally use a newer TOOLSET (installed on $(SYSROOT)).
SYSROOT = /opt/RHEL7
GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
# "Cross" TOOLSET progs need to find their libraries
LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)

2
configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a
View File

@@ -1 +1 @@
GNU_BIN=/opt/RHEL7/bin
GNU_BIN = /opt/RHEL7/bin

2
configure/os/CONFIG_SITE.Common.linuxCommon
View File

@@ -14,7 +14,7 @@ USR_CXXFLAGS += $(STD_CXXFLAGS)
STD_CXXFLAGS = -std=c++11
TOOLSET_DIR = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
GNU_DIR = $(TOOLSET_DIR)
GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
TARGET_LDFLAGS += $(SYSROOT:%=--sysroot=%)

5
configure/os/CONFIG_SITE.linux-x86.Common
View File

@@ -11,8 +11,9 @@ INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPIC
GNU_HOST_ARCH=i686
GNU_HOST_OS=linux
# LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
LD_LIBRARY_PATH=
# set LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
# not exported LD_LIBRARY_PATH causes problem for RHEL7 cross compilation
export LD_LIBRARY_PATH=
# vxWorks for MVxxxx boards
#CROSS_COMPILER_TARGET_ARCHS += T2-ppc604

2
modules/pvData

Submodule modules/pvData updated: 763e39d435...3efc4e3fd8