Skip to content

[sonic-sairedis] Upgrade to c++17 #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Junchao-Mellanox wants to merge 7 commits into from
Closed

[sonic-sairedis] Upgrade to c++17 #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a23223
[sonic-sairedis] Upgrade to c++17
Junchao-Mellanox Jun 21, 2022
c614caf
Merge branch 'Azure:master' into upgrade-cpp17
Junchao-Mellanox Jun 27, 2022
cb8f8ed
Change azure pipeline image from buster to bullseye
Junchao-Mellanox Jul 1, 2022
7b64dac
Fix issue: swig3.0 cannot be found on bullseye
Junchao-Mellanox Jul 1, 2022
180db78
Disable python2 extension build on bullseye
Junchao-Mellanox Jul 1, 2022
9cf2f2a
Fix issue: change apt repo to debian 11
Junchao-Mellanox Jul 1, 2022
edaebf8
Fix issue: dependencies are all built with buster, hardcode buster he…
Junchao-Mellanox Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .azure-pipelines/build-swss-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ jobs:
path: $(Build.ArtifactStagingDirectory)/download
artifact: common-lib
patterns: |
target/debs/${{ parameters.debian_version }}/libnl-3*.deb
target/debs/${{ parameters.debian_version }}/libnl-genl*.deb
target/debs/${{ parameters.debian_version }}/libnl-route*.deb
target/debs/${{ parameters.debian_version }}/libnl-nf*.deb
target/debs/buster/libnl-3*.deb
target/debs/buster/libnl-genl*.deb
target/debs/buster/libnl-route*.deb
target/debs/buster/libnl-nf*.deb
displayName: "Download common libs"

- script: |
Expand Down
6 changes: 3 additions & 3 deletions .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
libnl-route-3-dev \
libnl-nf-3-dev \
libnl-cli-3-dev \
swig3.0 \
swig \
libpython2.7-dev \
libzmq5 \
libzmq3-dev \
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
set -ex
rm ../*.deb || true
./autogen.sh
DEB_BUILD_OPTIONS=nocheck fakeroot debian/rules DEB_CONFIGURE_EXTRA_FLAGS='--enable-code-coverage' CFLAGS="" CXXFLAGS="" binary-syncd-vs
DEB_BUILD_OPTIONS=nocheck DEB_BUILD_PROFILES=nopython2 fakeroot debian/rules DEB_CONFIGURE_EXTRA_FLAGS='--enable-code-coverage' CFLAGS="" CXXFLAGS="" binary-syncd-vs
mv ../*.deb .
displayName: "Compile sonic sairedis with coverage enabled"
- script: |
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
set -ex
# Install .NET CORE
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
sudo apt-add-repository https://packages.microsoft.com/debian/10/prod
sudo apt-add-repository https://packages.microsoft.com/debian/11/prod
sudo apt-get update
sudo apt-get install -y dotnet-sdk-5.0
displayName: "Install .NET CORE"
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ resources:
parameters:
- name: debian_version
type: string
default: buster
default: bullseye
Copy link
Copy Markdown
Collaborator

@kcudnik kcudnik Jul 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on .azure-pipelines/build-swss-template.yml tou set explicit target to buster, but here to bullseye, will that be a conflict?

Copy link
Copy Markdown
Contributor Author

@Junchao-Mellanox Junchao-Mellanox Jul 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have to do this because there is no other pipeline that are using bullseye. So, if I do not set explicit target to buster in .azure-pipelines/build-swss-template.yml, it cannot download dependencies like "libnl*".

variables:
- name: BUILD_BRANCH
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
Expand Down
3 changes: 2 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ AC_PATH_PROGS(SWIG, [swig3.0 swig])
CXXFLAGS_COMMON=""
CXXFLAGS_COMMON+=" -ansi"
CXXFLAGS_COMMON+=" -fPIC"
CXXFLAGS_COMMON+=" -std=c++14"
CXXFLAGS_COMMON+=" -std=c++17"
CXXFLAGS_COMMON+=" -Wall"
CXXFLAGS_COMMON+=" -Wcast-align"
CXXFLAGS_COMMON+=" -Wcast-qual"
Expand Down Expand Up @@ -157,6 +157,7 @@ CXXFLAGS_COMMON+=" -Wwrite-strings"
CXXFLAGS_COMMON+=" -Wno-switch-default"
CXXFLAGS_COMMON+=" -Wconversion"
CXXFLAGS_COMMON+=" -Wno-psabi"
CXXFLAGS_COMMON+=" -Wno-register"
Copy link
Copy Markdown
Contributor

@qiluo-msft qiluo-msft Jun 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need this? I search codebase and did not find register storage class specifier.
ref: https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html#index-Wno-register


SAVED_FLAGS="$CXXFLAGS"
CXXFLAGS="-Wcast-align=strict"
Expand Down