Merge pull request 'move Qt sources to shstk.ru' (#3) from master into release
SHS Gitea/docker/pipeline/head There was a failure building this commit
SHS Gitea/docker/pipeline/head There was a failure building this commit
Reviewed-on: #3
This commit was merged in pull request #3.
This commit is contained in:
@@ -127,7 +127,7 @@ RUN wget -nv https://mirror.tochlab.net/pub/gnu/libmicrohttpd/libmicrohttpd-${CU
|
||||
# Qt
|
||||
WORKDIR /soft
|
||||
RUN if [ "${QT_FROM_SOURCE}" = "1" ]; then \
|
||||
wget -nv http://qt-mirror.dannhauer.de/archive/qt/${CUR_QT_VERSION_MAJOR}/${CUR_QT_VERSION}/single/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
wget -nv https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
&& tar xf qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz -C /soft \
|
||||
&& rm -f qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
&& mkdir -p /soft/build/qt && cd /soft/build/qt \
|
||||
|
||||
+1
-1
@@ -88,7 +88,7 @@ RUN wget -nv https://mirror.tochlab.net/pub/gnu/libmicrohttpd/libmicrohttpd-${CU
|
||||
ENV SYSROOT=/soft/osxcross/target/SDK/MacOSX10.14.sdk
|
||||
ENV CROSS_COMPILE=/soft/osxcross/target/bin/x86_64-${_DARWIN}-
|
||||
WORKDIR /soft
|
||||
RUN wget -nv http://qt-mirror.dannhauer.de/archive/qt/${CUR_QT_VERSION_MAJOR}/${CUR_QT_VERSION}/single/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
RUN wget -nv https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
&& tar -xf qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz -C /soft \
|
||||
&& rm -f qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
&& mkdir -p /soft/osx/build/qt && cd /soft/osx/build/qt \
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ RUN ln -s /usr/bin/arm-linux-gnueabihf-ar /usr/bin/arm-linux-gnueabi-ar
|
||||
RUN ln -s /usr/bin/arm-linux-gnueabihf-nm /usr/bin/arm-linux-gnueabi-nm
|
||||
RUN ln -s /usr/bin/arm-linux-gnueabihf-strip /usr/bin/arm-linux-gnueabi-strip
|
||||
RUN ln -s /usr/bin/arm-linux-gnueabihf-objcopy /usr/bin/arm-linux-gnueabi-objcopy
|
||||
RUN wget -nv http://qt-mirror.dannhauer.de/archive/qt/${CUR_QT_VERSION_MAJOR}/${CUR_QT_VERSION}/single/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
RUN wget -nv https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
&& tar -xf qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz -C /soft \
|
||||
&& rm -f qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
&& mkdir -p /soft/build/qt && cd /soft/build/qt \
|
||||
|
||||
+1
-1
@@ -146,7 +146,7 @@ RUN wget -nv https://github.com/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VE
|
||||
# Qt
|
||||
ENV QT_SRC=/soft/qt-everywhere-src-${CUR_QT_VERSION}
|
||||
WORKDIR /soft
|
||||
RUN wget -v https://mirrors.ustc.edu.cn/qtproject/archive/qt/${CUR_QT_VERSION_MAJOR}/${CUR_QT_VERSION}/single/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
RUN wget -v https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
&& tar -xf qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz -C /soft \
|
||||
&& rm -f qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
|
||||
&& cd ${QT_SRC}/qtdeclarative/src/plugins/scenegraph/d3d12 \
|
||||
|
||||
Reference in New Issue
Block a user