diff --git a/Dockerfile b/Dockerfile index a76a56e29ae556e1ef015886f9bde6d62bd18eb3..94cdd1a73766d52336090c8fbfb929f2bdcaf116 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,7 +73,9 @@ RUN set -ex && \ binutils-arm-linux-gnueabihf \ g++-multilib-arm-linux-gnueabihf \ gcc-multilib-arm-linux-gnueabihf && \ - apt-get clean + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + # Install OSx cross-tools @@ -151,16 +153,34 @@ RUN mkdir -p /usr/x86_64-linux-gnu; # we need to use default clang binary to avoid a bug in osxcross that recursively call himself # with more and more parameters +COPY OpenCL_DLL /root/OpenCL_DLL/ +COPY OpenCL_ARM /root/OpenCL_ARM/ RUN mkdir -p ~/msys2-OpenCL-headers && \ - cd ~/msys2-OpenCL-headers && \ + cd /root/msys2-OpenCL-headers && \ wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-opencl-headers-2~2.2.20200327-1-any.pkg.tar.xz && \ tar xvJf mingw-w64-x86_64-opencl-headers-2~2.2.20200327-1-any.pkg.tar.xz && \ - mkdir -p ~/openjdk/windows64 && \ - cd ~/openjdk/windows64 && \ - wget https://builds.openlogic.com/downloadJDK/openlogic-openjdk/8u272-b10/openlogic-openjdk-8u272-b10-windows-x64.zip + mkdir -p /root/openjdk/windows64 && \ + cd /root/openjdk/windows64 && \ + wget https://builds.openlogic.com/downloadJDK/openlogic-openjdk/8u272-b10/openlogic-openjdk-8u272-b10-windows-x64.zip && \ + cd /usr/src && \ + unzip /root/openjdk/windows64/openlogic-openjdk-8u272-b10-windows-x64.zip && \ + rm -rf /root/openjdk && \ + cp -av /root/OpenCL_* /usr/src && \ + rm -rf /root/OpenCL_* && \ + cd /usr/src/OpenCL_ARM/aarch64 && \ + ln -s libOpenCL.so.1.0.0 libOpenCL.so && \ + cd /usr/src/OpenCL_ARM/armhf && \ + ln -s libOpenCL.so.1.0.0 libOpenCL.so && \ + cp -av /root/msys2-OpenCL-headers /usr/src && \ + rm -rf /root/msys2-OpenCL-headers + + +RUN cd /root && \ + wget https://builds.openlogic.com/downloadJDK/openlogic-openjdk/8u272-b10/openlogic-openjdk-8u272-b10-mac-x64.zip && \ + cd /usr/src && \ + unzip /root/openlogic-openjdk-8u272-b10-mac-x64.zip && \ + rm -rf /root/openlogic-openjdk-8u272-b10-mac-x64.zip -COPY OpenCL_DLL /root/OpenCL_DLL/ -COPY OpenCL_ARM /root/OpenCL_ARM/ COPY ./crossbuild /usr/bin/crossbuild ENV LD_LIBRARY_PATH /usr/osxcross/lib::$LD_LIBRARY_PATH