upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-23 19:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use gcc-9 in the Scout runtime instead of gcc-5.

Browse Source 
The gcc-9 shipped with the Scout runtime forces the use of -static-libstdc++ which is what allows this to work. However, LTO is not yet able to be enabled since as of right now it simply crashes immediately with `free(): invalid pointer`.
This commit is contained in:
Pentarctagon 2021-01-16 00:57:22 -06:00 committed by Pentarctagon
parent 005fdac6df
commit ef7d69b953
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci-main.yml vendored
View File

@ -169,8 +169,8 @@ jobs:
export IMAGE=steamrt
export NLS=false
export TOOL=scons
export CC=gcc-5
export CXX=g++-5
export CC=gcc-9
export CXX=g++-9
export CXX_STD=14
export CFG=release
export LTO=false

6
utils/dockerbuilds/CI/Dockerfile-base-steamrt
View File

@ -4,10 +4,10 @@ ARG BOOST_VERSION=1.66.0
ARG BOOST_VERSION_=1_66_0
RUN apt-get update
RUN apt-get install -y scons libsdl2-dev libsdl2 g++-5 libicu-dev libreadline-dev expect-dev
RUN apt-get install -y scons libsdl2-dev libicu-dev libreadline-dev expect-dev
RUN wget --max-redirect 3 https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.gz
RUN mkdir -p /src/boost && tar zxf boost_${BOOST_VERSION_}.tar.gz -C /src/boost --strip-components=1
RUN cd /src/boost && ./bootstrap.sh --with-libraries=iostreams,regex,system,filesystem,program_options,random,locale,context,coroutine && ./b2 toolset=gcc-5 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install
RUN cd /src/boost && ./bootstrap.sh --with-libraries=iostreams,regex,system,filesystem,program_options,random,locale,context,coroutine && ./b2 toolset=gcc-9 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install
RUN mkdir -p /staging/lib64 && cp /usr/lib/libicu*.so.* /lib/x86_64-linux-gnu/libhistory.so.6 /staging/lib64/
RUN mkdir -p /staging/lib64 && cp /usr/lib/libicu*.so.* /lib/x86_64-linux-gnu/libhistory.so.6 /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 /staging/lib64/

2
utils/dockerbuilds/make_steam_image
View File

@ -2,7 +2,7 @@
VALVEFILE=com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.Dockerfile
VALVETAR=com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.tar.gz
VALVE_SNAPSHOT=0.20201007.1
VALVE_SNAPSHOT=0.20210114.2
DOCKERBASEIMAGE=steamrt_scout_amd64
DOCKERLOCALIMAGE=wesnoth/wesnoth:steamrt-master

2
utils/dockerbuilds/steamrt/Dockerfile
View File

@ -3,4 +3,4 @@ ENV DEBIAN_FRONTEND=noninteractive
COPY start.sh /staging/start.sh
ENTRYPOINT mkdir -p /build && cd /build && scons -j `nproc` ctool=gcc-5 cxxtool=g++-5 boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt -Y /wesnoth && cp /build/wesnoth /output/ && cp /build/wesnothd /output/ && cp -r /staging/* /output/
ENTRYPOINT mkdir -p /build && cd /build && scons -j `nproc` ctool=gcc-9 cxxtool=g++-9 boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt -Y /wesnoth && cp /build/wesnoth /output/ && cp /build/wesnothd /output/ && cp -r /staging/* /output/