diff options
| author | Sergio Martins <smartins@kde.org> | 2020-07-04 13:28:15 +0100 |
|---|---|---|
| committer | Sergio Martins <smartins@kde.org> | 2020-07-04 13:28:15 +0100 |
| commit | 882da655a3f56c1fe3c5cd2b0b6f2f235517a5f0 (patch) | |
| tree | c044a66abd4c5105045db2dfe4705b16450fa258 /dev-scripts | |
| parent | 1bfcb3dbe9585fbce831d620f9a0cdbc8b4437a0 (diff) | |
AppImage: Bump to 1.7 and llvm-10
Requires building gcc-5.4 to build llvm-10
Diffstat (limited to 'dev-scripts')
| -rw-r--r-- | dev-scripts/docker/AppImage/Dockerfile | 17 | ||||
| -rwxr-xr-x | dev-scripts/docker/make_appimage.sh | 3 |
2 files changed, 11 insertions, 9 deletions
diff --git a/dev-scripts/docker/AppImage/Dockerfile b/dev-scripts/docker/AppImage/Dockerfile index 62575b93..28189032 100644 --- a/dev-scripts/docker/AppImage/Dockerfile +++ b/dev-scripts/docker/AppImage/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Sergio Martins (sergio.martins@kdab.com) WORKDIR / RUN yum update -y -RUN yum install -y git wget boost-regex boost-devel svn flex zip texinfo +RUN yum install -y git wget zip texinfo bison flex svn boost-regex boost-devel RUN wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo RUN yum install -y devtoolset-2-gcc devtoolset-2-binutils devtoolset-2-gcc-c++ @@ -12,12 +12,16 @@ ENV PATH=/opt/rh/devtoolset-2/root/usr/bin/:$PATH # Build GCC WORKDIR / -svn co svn://gcc.gnu.org/svn/gcc/tags/gcc_5_1_0_release/ -WORKDIR /gcc_5_1_0_release/ +RUN svn co svn://gcc.gnu.org/svn/gcc/tags/gcc_5_4_0_release/ +WORKDIR /gcc_5_4_0_release/ RUN ./contrib/download_prerequisites -RUN mkdir /gcc_5_1_0_release_build/ -WORKDIR /gcc_5_1_0_release_build/ -RUN ../gcc_5_1_0_release/configure --disable-multilib && make -j12 && make install +RUN mkdir /gcc_5_4_0_release_build/ +WORKDIR /gcc_5_4_0_release_build/ +RUN ../gcc_5_4_0_release/configure --disable-multilib +RUN make -j12 +RUN make install +RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/newStdLib.conf +RUN ldconfig ENV CXX=/usr/local/bin/g++ ENV CC=/usr/local/bin/gcc @@ -26,6 +30,7 @@ ENV CC=/usr/local/bin/gcc ADD clazy.AppDir /clazy.AppDir/ # Build Python +WORKDIR / RUN wget https://www.python.org/ftp/python/2.7.16/Python-2.7.16.tgz RUN tar xzf Python-2.7.16.tgz WORKDIR /Python-2.7.16 diff --git a/dev-scripts/docker/make_appimage.sh b/dev-scripts/docker/make_appimage.sh index bd4cbf94..e695f454 100755 --- a/dev-scripts/docker/make_appimage.sh +++ b/dev-scripts/docker/make_appimage.sh @@ -5,9 +5,6 @@ # $1 clazy sha1 to build # $2 user uid to chown the files to before leaving docker -CC=gcc -CXX=g++ - mkdir /tmp/clazy_work/ cp -r /clazy.AppDir/ /tmp/clazy_work/ |