Bump rhel to gcc13, to avoid gcc12 warnings in openair1
This commit is contained in:
@@ -57,8 +57,9 @@ RUN rm -f /etc/rhsm-host && \
|
||||
python3-devel \
|
||||
numactl-libs \
|
||||
numactl-devel \
|
||||
gcc-toolset-12-gcc \
|
||||
gcc-toolset-12-gcc-c++ \
|
||||
#use gcc-13 to avoid problems of default gcc-11 in FlexRIC
|
||||
gcc-toolset-13-gcc \
|
||||
gcc-toolset-13-gcc-c++ \
|
||||
# python3-pip and pyyaml are used for conf template generation
|
||||
python3-pip && \
|
||||
pip3 install --ignore-installed pyyaml && \
|
||||
@@ -90,6 +91,6 @@ COPY oaienv .
|
||||
RUN /bin/sh oaienv && \
|
||||
cd cmake_targets && \
|
||||
mkdir -p log && \
|
||||
scl enable gcc-toolset-12 "\
|
||||
scl enable gcc-toolset-13 "\
|
||||
./build_oai -I --install-optional-packages -w USRP" && \
|
||||
rm /etc/pki/entitlement/*pem
|
||||
|
||||
@@ -34,7 +34,6 @@ ENV BUILD_UHD_FROM_SOURCE=True
|
||||
ENV UHD_VERSION=4.4.0.0
|
||||
|
||||
#install developers pkg/repo
|
||||
#use gcc-12 to avoid problems of default gcc-11 in FlexRIC
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --yes \
|
||||
@@ -42,6 +41,7 @@ RUN apt-get update && \
|
||||
build-essential \
|
||||
psmisc \
|
||||
git \
|
||||
#use gcc-12 to avoid problems of default gcc-11 in FlexRIC
|
||||
gcc-12 \
|
||||
g++-12 \
|
||||
xxd \
|
||||
|
||||
@@ -56,7 +56,7 @@ ARG KPM_VERSION=KPM_V3_00
|
||||
RUN /bin/sh oaienv && \
|
||||
cd cmake_targets && \
|
||||
mkdir -p log && \
|
||||
scl enable gcc-toolset-12 "\
|
||||
scl enable gcc-toolset-13 "\
|
||||
./build_oai \
|
||||
--gNB \
|
||||
--build-lib 'telnetsrv enbscope uescope nrscope' \
|
||||
@@ -70,7 +70,7 @@ RUN /bin/sh oaienv && \
|
||||
## Build FlexRIC for SM Models
|
||||
RUN mkdir -p openair2/E2AP/flexric/build && \
|
||||
cd openair2/E2AP/flexric/build && \
|
||||
scl enable gcc-toolset-12 "\
|
||||
scl enable gcc-toolset-13 "\
|
||||
cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
|
||||
-DXAPP_MULTILANGUAGE=OFF \
|
||||
-DKPM_VERSION=$KPM_VERSION \
|
||||
|
||||
@@ -38,7 +38,7 @@ COPY . .
|
||||
RUN /bin/sh oaienv && \
|
||||
cd cmake_targets && \
|
||||
mkdir -p log && \
|
||||
scl enable gcc-toolset-12 "\
|
||||
scl enable gcc-toolset-13 "\
|
||||
CXXFLAGS='-Werror -fstack-protector-strong' CFLAGS='-Werror -fstack-protector-strong' ./build_oai -c --ninja \
|
||||
--eNB --gNB --RU --UE --nrUE \
|
||||
--build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt \
|
||||
@@ -54,7 +54,7 @@ RUN /bin/sh oaienv && \
|
||||
## Build FlexRIC for SM Models
|
||||
RUN mkdir -p openair2/E2AP/flexric/build && \
|
||||
cd openair2/E2AP/flexric/build && \
|
||||
scl enable gcc-toolset-12 "\
|
||||
scl enable gcc-toolset-13 "\
|
||||
cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
|
||||
-DXAPP_MULTILANGUAGE=OFF \
|
||||
-DKPM_VERSION=$KPM_VERSION \
|
||||
|
||||
Reference in New Issue
Block a user