Skip to content

Commit fabb24e

Browse files
dcermakSUSE Update Bot
authored and
SUSE Update Bot
committed
Test build for #1092
1 parent f46df79 commit fabb24e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

gcc-12-image/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ LABEL org.opensuse.release-stage="released"
4040

4141
# endlabelprefix
4242

43-
RUN set -euo pipefail; zypper -n in --no-recommends gcc12 gcc12-c++ make; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
43+
RUN set -euo pipefail; zypper -n in --no-recommends gcc12 gcc12-c++ make gawk; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
4444
ENV GCC_VERSION="%%gcc_version%%"
4545

4646
# symlink all versioned gcc & g++ binaries to unversioned
4747
# ones in /usr/local/bin so that plain gcc works
4848
RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc12 gcc12-c++ |grep ^/usr/bin/ ); do \
49-
ln -f $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-12$||'); \
49+
ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-12$||'); \
5050
done

gcc-13-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ LABEL org.opensuse.release-stage="released"
4040

4141
# endlabelprefix
4242

43-
RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make gcc gcc-c++; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
43+
RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make gawk gcc gcc-c++; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
4444
ENV GCC_VERSION="%%gcc_version%%"
4545

gcc-14-image/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ LABEL org.opensuse.release-stage="released"
4141

4242
# endlabelprefix
4343

44-
RUN set -euo pipefail; zypper -n in --no-recommends gcc14 gcc14-c++ make; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
44+
RUN set -euo pipefail; zypper -n in --no-recommends gcc14 gcc14-c++ make gawk; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
4545
ENV GCC_VERSION="%%gcc_version%%"
4646

4747
# symlink all versioned gcc & g++ binaries to unversioned
4848
# ones in /usr/local/bin so that plain gcc works
4949
RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc14 gcc14-c++ |grep ^/usr/bin/ ); do \
50-
ln -f $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-14$||'); \
50+
ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-14$||'); \
5151
done

0 commit comments

Comments
 (0)