Skip to content

Commit 15bd6b0

Browse files
committed
workflows: use gcc14 for CE22 and LE13
1 parent 5e8e574 commit 15bd6b0

1 file changed

Lines changed: 23 additions & 14 deletions

File tree

.github/workflows/build-vdrsternelec.yml

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,33 @@ jobs:
7777
rdfind rsync sed libjson-parse-perl tar unzip upx-ucl wget \
7878
xfonts-utils xsltproc xz-utils zip zstd parallel
7979
80-
sudo apt-get install -y cpp-12 g++-12 gcc-12 || true
81-
sudo apt-get install -y cpp-13 g++-13 gcc-13 || true
82-
sudo apt-get install -y cpp-14 g++-14 gcc-14 || true
80+
81+
# ssudo apt-get install -y cpp-13 g++-13 gcc-13 || true
82+
8383
8484
if [[ "${{ inputs.config }}" == CoreELEC-20* ]] || [[ "${{ inputs.config }}" == CoreELEC-21* ]] || [[ "${{ inputs.config }}" == LibreELEC-12* ]] ; then
85-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100
86-
sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-12 100
87-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100
88-
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-12 100
89-
90-
sudo update-alternatives --config gcc
85+
sudo apt-get install -y cpp-12 g++-12 gcc-12 || true
86+
#sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100
87+
#sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-12 100
88+
#sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100
89+
#sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-12 100
90+
#
91+
#sudo update-alternatives --config gcc
9192
elif [[ "${{ inputs.config }}" == CoreELEC-22* ]] || [[ "${{ inputs.config }}" == LibreELEC-13* ]] ; then
92-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 \
93-
--slave /usr/bin/g++ g++ /usr/bin/g++-14 \
94-
--slave /usr/bin/gcov gcov /usr/bin/gcov-14
93+
sudo apt-get install -y cpp-14 g++-14 gcc-14 || true
94+
95+
sudo rm /usr/bin/gcc /usr/bin/cpp /usr/bin/g++ /usr/bin/gcov
96+
sudo ln -s /usr/bin/gcc-14 /usr/bin/gcc
97+
sudo ln -s /usr/bin/cpp-14 /usr/bin/cpp
98+
sudo ln -s /usr/bin/g++-14 /usr/bin/g++
99+
sudo ln -s /usr/bin/gcov-14 /usr/bin/gcov
95100
96-
sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-14 100
97-
sudo update-alternatives --config gcc
101+
#sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 \
102+
# --slave /usr/bin/g++ g++ /usr/bin/g++-14 \
103+
# --slave /usr/bin/gcov gcov /usr/bin/gcov-14
104+
#
105+
#sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-14 100
106+
#sudo update-alternatives --config gcc
98107
fi
99108
100109
if [ "$(uname -m)" = "aarch64" ]; then

0 commit comments

Comments
 (0)