archlinux-mingw: Add mingw-w64-lld

openturns · Jul 16, 2024 · 20ceade · 20ceade
1 parent 74bff5d
commit 20ceade
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/archlinux-mingw/Dockerfile b/archlinux-mingw/Dockerfile
@@ -14,7 +14,7 @@ RUN echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" | sudo tee -a /etc/
 #RUN sudo pacman -U --noconfirm https://archive.archlinux.org/packages/w/wine/wine-7.16-1-x86_64.pkg.tar.zst && echo -e '[options]\nIgnorePkg = wine' | sudo tee -a /etc/pacman.conf
 
 # Install MinGW packages
-RUN aurman -Syu --noconfirm --noedit --pgp_fetch nsis mingw-w64-muparser mingw-w64-hmat-oss mingw-w64-cminpack mingw-w64-coin-or-bonmin \
+RUN aurman -Syu --noconfirm --noedit --pgp_fetch nsis mingw-w64-lld mingw-w64-muparser mingw-w64-cminpack mingw-w64-coin-or-bonmin \
     mingw-w64-spectra mingw-w64-cmake mingw-w64-wine mingw-w64-libxml2 mingw-w64-boost mingw-w64-lapack mingw-w64-nlopt mingw-w64-pagmo \
     mingw-w64-ceres-solver mingw-w64-eigen mingw-w64-dlib mingw-w64-onetbb mingw-w64-hdf5 mingw-w64-libmpc mingw-w64-primesieve mingw-w64-nanoflann mingw-w64-libcuba
 RUN for pyver in 38 39 310 311 312; do aurman -Syu --noconfirm --noedit mingw-w64-python${pyver}-bin; x86_64-w64-mingw32-python${pyver}-bin -c "import sys; print('.'.join([str(x) for x in sys.version_info[:3]]))"; done
diff --git a/archlinux-module-mingw/Dockerfile b/archlinux-module-mingw/Dockerfile
@@ -1,18 +1,23 @@
 FROM openturns/archlinux-mingw:latest
 MAINTAINER jschueller
 
-RUN aurman -Syu --pgp_fetch --noconfirm --noedit mingw-w64-agrum mingw-w64-fftw mingw-w64-libmixmod
+# RUN aurman -Syu --pgp_fetch --noconfirm --noedit mingw-w64-agrum mingw-w64-fftw mingw-w64-libmixmod
+# RUN sudo pacman -Syu --noconfirm
 
 ENV ARCH=x86_64 PYMAJMIN=311
 ENV MINGW_PREFIX /usr/${ARCH}-w64-mingw32
 
+# Install AUR helper
+# RUN git clone https://aur.archlinux.org/mingw-w64-coin-or-ipopt.git /tmp/aurman && cd /tmp/aurman \
+#  && makepkg -sfi --skippgpcheck --noconfirm && rm -r /tmp/aurman
+
 # openturns
-RUN git clone -b v1.23 --depth 1 https://github.com/openturns/openturns.git /tmp/openturns && cd /tmp/openturns \
+RUN git clone --depth 1 https://github.com/openturns/openturns.git /tmp/openturns && cd /tmp/openturns \
   && ${ARCH}-w64-mingw32-cmake \
   -DPython_INCLUDE_DIR=${MINGW_PREFIX}/include/python${PYMAJMIN} -DPython_LIBRARY=${MINGW_PREFIX}/lib/libpython${PYMAJMIN}.dll.a \
   -DPython_EXECUTABLE=/usr/bin/${ARCH}-w64-mingw32-python${PYMAJMIN}-bin \
   -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 -DSWIG_COMPILE_FLAGS="-O1" -DUSE_SPHINX=OFF . \
-  && make -j2 && sudo make install \
-  && sudo ${ARCH}-w64-mingw32-strip --strip-unneeded ${MINGW_PREFIX}/bin/libOT.dll ${MINGW_PREFIX}/Lib/site-packages/openturns/*.pyd \
-  && rm -r /tmp/openturns*
+  && make && sudo make install \
+  && sudo ${ARCH}-w64-mingw32-strip --strip-unneeded ${MINGW_PREFIX}/bin/libOT.dll ${MINGW_PREFIX}/Lib/site-packages/openturns/*.pyd
+RUN cd /tmp/openturns && ctest -E cppcheck -R "TruncatedNormal" --output-on-failure