Skip to content

Commit

Permalink
Test build for #1092
Browse files Browse the repository at this point in the history
  • Loading branch information
dcermak authored and SUSE Update Bot committed May 7, 2024
1 parent f46df79 commit fabb24e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions gcc-12-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

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}
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}
ENV GCC_VERSION="%%gcc_version%%"

# symlink all versioned gcc & g++ binaries to unversioned
# ones in /usr/local/bin so that plain gcc works
RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc12 gcc12-c++ |grep ^/usr/bin/ ); do \
ln -f $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-12$||'); \
ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-12$||'); \
done
2 changes: 1 addition & 1 deletion gcc-13-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

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}
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}
ENV GCC_VERSION="%%gcc_version%%"

4 changes: 2 additions & 2 deletions gcc-14-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

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}
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}
ENV GCC_VERSION="%%gcc_version%%"

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

0 comments on commit fabb24e

Please sign in to comment.