diff --git a/manylinux_2_31/Dockerfile b/manylinux_2_31/Dockerfile index 9101fc7..93dc02c 100644 --- a/manylinux_2_31/Dockerfile +++ b/manylinux_2_31/Dockerfile @@ -19,14 +19,15 @@ RUN apt-get update && \ git \ && rm -rf /var/lib/apt/lists/* -COPY ./scripts/install_python.sh ./scripts/install_pipx.sh ./scripts/install_qt.sh / - +COPY ./scripts/install_python.sh / RUN /install_python.sh && rm -f /install_python.sh +COPY ./scripts/install_pipx.sh / RUN /install_pipx.sh && rm -f /install_pipx.sh RUN pipx install aqtinstall==${AQTINSTALL_VERSION} ENV PATH=/root/.local/bin:$PATH +COPY ./scripts/install_qt.sh / RUN /install_qt.sh && rm -f /install_qt.sh ENV PATH="/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH" diff --git a/pyside_builder_manylinux_2_28_x86_64/Dockerfile b/pyside_builder_manylinux_2_28_x86_64/Dockerfile index acb9828..d569600 100644 --- a/pyside_builder_manylinux_2_28_x86_64/Dockerfile +++ b/pyside_builder_manylinux_2_28_x86_64/Dockerfile @@ -18,14 +18,16 @@ RUN yum -y update \ && yum clean all \ && rm -rf /var/cache/yum -COPY ./scripts/install_python.sh ./scripts/install_pipx.sh ./scripts/install_qt.sh / +COPY ./scripts/install_python.sh / ARG PYTHON_VERSION=3.9 RUN /install_python.sh && rm -f /install_python.sh +COPY ./scripts/install_pipx.sh / RUN /install_pipx.sh && rm -f /install_pipx.sh ARG AQTINSTALL_VERSION=3.1.7 RUN pipx install aqtinstall==${AQTINSTALL_VERSION} ENV PATH=/root/.local/bin:$PATH ARG QT_VERSION=6.4.2 +COPY ./scripts/install_qt.sh / RUN /install_qt.sh && rm -f /install_qt.sh ENV PATH="/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH" diff --git a/scripts/install_qt.sh b/scripts/install_qt.sh index 5e0477b..e59dfdb 100755 --- a/scripts/install_qt.sh +++ b/scripts/install_qt.sh @@ -2,4 +2,77 @@ source "$HOME/.bashrc" -aqt install-qt --outputdir /opt/Qt linux desktop ${QT_VERSION} \ No newline at end of file +# check is x86 + +if [[ "$(uname -m)" == "x86_64" ]]; then + aqt install-qt --outputdir /opt/Qt linux desktop ${QT_VERSION} +else + apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + build-essential \ + cmake \ + ninja-build \ + git \ + perl \ + libclang-dev \ + libfontconfig1-dev \ + libdbus-1-dev \ + libfreetype6-dev \ + libicu-dev \ + libinput-dev \ + libxkbcommon-dev \ + libxkbcommon-x11-dev \ + libsqlite3-dev \ + libssl-dev \ + libpng-dev \ + libjpeg-dev \ + libglib2.0-dev \ + libpulse-dev \ + libasound2-dev \ + libegl1-mesa-dev \ + libxcb1-dev \ + libx11-dev \ + libx11-xcb-dev \ + libxext-dev \ + libxfixes-dev \ + libxi-dev \ + libxrender-dev \ + libxcb-cursor-dev \ + libxcb-glx0-dev \ + libxcb-keysyms1-dev \ + libxcb-image0-dev \ + libxcb-shm0-dev \ + libxcb-icccm4-dev \ + libxcb-sync-dev \ + libxcb-xfixes0-dev \ + libxcb-shape0-dev \ + libxcb-randr0-dev \ + libxcb-render-util0-dev \ + libxcb-util-dev \ + libxcb-xinerama0-dev \ + libxcb-xkb-dev \ + libdrm-dev \ + libwayland-dev \ + libxcomposite-dev \ + libxcursor-dev \ + libxdamage-dev \ + libxrandr-dev \ + libxtst-dev \ + libxss-dev \ + libglu1-mesa-dev \ + mesa-common-dev \ + libgl1-mesa-dev \ + libgles2-mesa-dev \ + libgl1-mesa-dri \ + p7zip-full \ + && rm -rf /var/lib/apt/lists/* + + aqt install-src --outputdir /opt/Qt linux desktop ${QT_VERSION} + + cd /opt/Qt/${QT_VERSION}/Src + ./configure + cmake --build . --parallel $(nproc) + cmake --install . +fi +# else if arm build from sources +