[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop/5.3] appimage: appimage: Use Qt 5.9.6 & LLVM 6.0.0
From:       Kevin Funk <null () kde ! org>
Date:       2018-09-19 16:04:02
Message-ID: E1g2exO-0004DA-AO () code ! kde ! org
[Download RAW message or body]

Git commit d5befff0fca8e93d23689fe048319ee637c11f06 by Kevin Funk.
Committed on 19/09/2018 at 16:03.
Pushed by kfunk into branch '5.3'.

appimage: Use Qt 5.9.6 & LLVM 6.0.0

M  +3    -3    appimage/Dockerfile

https://commits.kde.org/kdevelop/d5befff0fca8e93d23689fe048319ee637c11f06

diff --git a/appimage/Dockerfile b/appimage/Dockerfile
index 9c6a3c555d..eb70ee1aea 100644
--- a/appimage/Dockerfile
+++ b/appimage/Dockerfile
@@ -5,7 +5,7 @@ RUN cd /tmp && wget \
http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/su  
 RUN echo ". /opt/rh/devtoolset-6/enable && chmod +x /opt/rh/python27/enable && . \
/opt/rh/python27/enable" >> /root/.bashrc  
-ENV LC_ALL=en_US.UTF-8 LANG=en_us.UTF-8 QTVERSION=5.9.2 QTVERSION_SHORT=5.9 \
LLVM_VERSION=5.0.0 LLVM_ROOT=/opt/llvm/ LD_LIBRARY_PATH=$QTDIR/lib/ +ENV \
LC_ALL=en_US.UTF-8 LANG=en_us.UTF-8 QTVERSION=5.9.6 QTVERSION_SHORT=5.9 \
LLVM_VERSION=6.0.1 LLVM_ROOT=/opt/llvm/ LD_LIBRARY_PATH=$QTDIR/lib/  ENV \
QTDIR=/usr/local/Qt-${QTVERSION}/  
 RUN bash -c "ln -sf /opt/rh/devtoolset-6/root/usr/bin/g++ /usr/bin/g++ && ln -sf \
/opt/rh/devtoolset-6/root/usr/bin/c++ /usr/bin/c++" @@ -28,8 +28,8 @@ RUN bash -c \
"yum install unzip && mkdir -p /tmp/deploy && cd /tmp/deploy && wget  # Build \
Clang/LLVM  RUN bash -c "mkdir -p /llvm && cd /llvm && wget \
http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"  RUN bash \
-c "cd /llvm && tar xvf llvm-${LLVM_VERSION}.src.tar.xz && cd \
                llvm-${LLVM_VERSION}.src"
-RUN bash -c "cd /llvm/tools && wget \
                http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz"
                
-RUN bash -c "cd /llvm/tools && tar xvf cfe-${LLVM_VERSION}.src.tar.xz"
+RUN bash -c "cd /llvm/llvm-${LLVM_VERSION}.src/tools && wget \
http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz" +RUN bash -c \
"cd /llvm/llvm-${LLVM_VERSION}.src/tools && tar xvf cfe-${LLVM_VERSION}.src.tar.xz"  \
RUN bash -c ". /opt/rh/python27/enable && . /opt/rh/devtoolset-6/enable && python \
--version && cd /llvm/llvm-${LLVM_VERSION}.src && mkdir -p build && cd build && \
cmake3 -G Ninja .. -DCMAKE_INSTALL_PREFIX=/opt/llvm/ -DCMAKE_BUILD_TYPE=Release \
-DLLVM_INCLUDE_TESTS=OFF -DLLVM_TARGETS_TO_BUILD=X86 && ninja install && rm -Rf \
/llvm"  
 # Build Python


[prev in list] [next in list] [prev in thread] [next in thread]