# HG changeset patch # User Markus Mützel # Date 1600595821 -7200 # Node ID d862fd40cc42971d10e5c5f72033b56eb4f2fc06 # Parent 13628d1d41e24e0da5239162495166db2145684c Use ccache for packages built with cmake. * Makefile.in: New variable CMAKE_CCACHE_FLAGS. * src/armadillo.mk, src/cgal.mk, src/cmake.mk, src/cminpack, src/double-conversion.mk, src/eigen.mk, src/gdcm.mk, src/gl2ps.mk, src/hdf5.mk, src/lapack.mk, src/libical.mk, src/libproxy, src/llvm.mk, src/of-dicom.mk, src/openal.mk, src/opencv.mk, src/openexr.mk, src/openscenegraph.mk, src/physfs.mk, src/qhull.mk, src/qjson.mk, src/rapidjson.mk, src/suitesparse.mk, src/sundials-ida.mk, src/taglib.mk, src/vigra.mk, src/vmime.mk, src/vtk.mk, src/wt.mk: Add new variable to cmake flags. Harmonize indentation in files. diff -r 13628d1d41e2 -r d862fd40cc42 Makefile.in --- a/Makefile.in Sat Sep 19 17:35:15 2020 +0200 +++ b/Makefile.in Sun Sep 20 11:57:01 2020 +0200 @@ -546,6 +546,13 @@ MAKE_SHARED_FROM_STATIC := \ $(TOP_DIR)/tools/make-shared-from-static $(MAKE_SHARED_FROM_STATIC_OPTIONS) +ifeq ($(USE_CCACHE),yes) + CMAKE_CCACHE_FLAGS := \ + -DCMAKE_CXX_COMPILER_LAUNCHER='$(CCACHE)' \ + -DCMAKE_C_COMPILER_LAUNCHER='$(CCACHE)' \ + -DCMAKE_Fortran_COMPILER_LAUNCHER='$(CCACHE)' +endif + CMAKE_TOOLCHAIN_FILE := $(HOST_PREFIX)/share/cmake/mxe-conf.cmake CMAKE_NATIVE_TOOLCHAIN_FILE := $(TOP_BUILD_DIR)/usr/share/cmake/native-conf.cmake diff -r 13628d1d41e2 -r d862fd40cc42 src/armadillo.mk --- a/src/armadillo.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/armadillo.mk Sun Sep 20 11:57:01 2020 +0200 @@ -18,7 +18,9 @@ endef define $(PKG)_BUILD - cd '$(1)' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)' && cmake . \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 # note: don't use -Werror with GCC 4.7.0 and .1 diff -r 13628d1d41e2 -r d862fd40cc42 src/cgal.mk --- a/src/cgal.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/cgal.mk Sun Sep 20 11:57:01 2020 +0200 @@ -25,6 +25,7 @@ -DCGAL_INSTALL_BIN_DIR:STRING="bin" \ -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ -DWITH_CGAL_Qt3:BOOL="0" \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DBOOST_COMPILER=_win32 \ -DBOOST_THREAD_USE_LIB=1 \ @@ -32,9 +33,11 @@ -DBUILD_SHARED_LIBS=0 \ -C TryRunResults.cgal.cmake . $(MAKE) -C '$(1)' -j $(JOBS) + cd '$(1)/examples/AABB_tree' && cmake \ -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ -DWITH_CGAL_Qt3:BOOL="0" \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DBOOST_COMPILER=_win32 \ -DBOOST_THREAD_USE_LIB=1 \ diff -r 13628d1d41e2 -r d862fd40cc42 src/cmake.mk --- a/src/cmake.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/cmake.mk Sun Sep 20 11:57:01 2020 +0200 @@ -8,7 +8,7 @@ $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_DEPS := $(PKG)_CMAKE_OPTS := ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -32,7 +32,8 @@ mkdir '$(1).build' cd '$(1).build' && cmake \ $($(PKG)_CMAKE_OPTS) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ ../$($(PKG)_SUBDIR) $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)' diff -r 13628d1d41e2 -r d862fd40cc42 src/cminpack.mk --- a/src/cminpack.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/cminpack.mk Sun Sep 20 11:57:01 2020 +0200 @@ -18,6 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)' -j $(JOBS) diff -r 13628d1d41e2 -r d862fd40cc42 src/double-conversion.mk --- a/src/double-conversion.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/double-conversion.mk Sun Sep 20 11:57:01 2020 +0200 @@ -22,6 +22,7 @@ cd '$(1)' && cmake \ $($(PKG)_CMAKE_FLAGS) \ -DBUILD_TESTING=no \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ . diff -r 13628d1d41e2 -r d862fd40cc42 src/eigen.mk --- a/src/eigen.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/eigen.mk Sun Sep 20 11:57:01 2020 +0200 @@ -20,6 +20,9 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && \ - cmake -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' '$(1)' + cmake \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' DESTDIR='$(3)' install endef diff -r 13628d1d41e2 -r d862fd40cc42 src/gdcm.mk --- a/src/gdcm.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/gdcm.mk Sun Sep 20 11:57:01 2020 +0200 @@ -25,35 +25,39 @@ endef ifeq ($(MXE_SYSTEM),msvc) -define $(PKG)_BUILD - mkdir '$(1)/../.build' - cd '$(1)/../.build' && cmake \ - -G "NMake Makefiles" \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DGDCM_BUILD_SHARED_LIBS:BOOL=TRUE \ - -DGDCM_USE_SYSTEM_ZLIB:BOOL=TRUE \ - -DGDCM_USE_SYSTEM_EXPAT:BOOL=TRUE \ - -DGDCM_BUILD_TESTING:BOOL=FALSE \ - -DGDCM_DOCUMENTATION:BOOL=FALSE \ - -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=FALSE \ - ../$($(PKG)_SUBDIR) - cd '$(1)/../.build' && \ - env -u MAKE -u MAKEFLAGS nmake && \ - env -u MAKE -u MAKEFLAGS nmake install -endef + define $(PKG)_BUILD + mkdir '$(1)/../.build' + cd '$(1)/../.build' && cmake \ + -G "NMake Makefiles" \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DGDCM_BUILD_SHARED_LIBS:BOOL=TRUE \ + -DGDCM_USE_SYSTEM_ZLIB:BOOL=TRUE \ + -DGDCM_USE_SYSTEM_EXPAT:BOOL=TRUE \ + -DGDCM_BUILD_TESTING:BOOL=FALSE \ + -DGDCM_DOCUMENTATION:BOOL=FALSE \ + -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=FALSE \ + ../$($(PKG)_SUBDIR) + + cd '$(1)/../.build' && \ + env -u MAKE -u MAKEFLAGS nmake && \ + env -u MAKE -u MAKEFLAGS nmake install + endef else -define $(PKG)_BUILD - mkdir '$(1)/../.build' - cd '$(1)/../.build' && cmake \ - $($(PKG)_CMAKE_OPTS) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DGDCM_BUILD_SHARED_LIBS:BOOL=TRUE \ - -DGDCM_BUILD_TESTING:BOOL=FALSE \ - -DGDCM_DOCUMENTATION:BOOL=FALSE \ - -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=FALSE \ - ../$($(PKG)_SUBDIR) - make -C $(1)/../.build -j $(JOBS) - make -C $(1)/../.build -j 1 install DESTDIR=$(3) -endef + define $(PKG)_BUILD + mkdir '$(1)/../.build' + cd '$(1)/../.build' && cmake \ + $($(PKG)_CMAKE_OPTS) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DGDCM_BUILD_SHARED_LIBS:BOOL=TRUE \ + -DGDCM_BUILD_TESTING:BOOL=FALSE \ + -DGDCM_DOCUMENTATION:BOOL=FALSE \ + -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=FALSE \ + ../$($(PKG)_SUBDIR) + + make -C $(1)/../.build -j $(JOBS) + make -C $(1)/../.build -j 1 install DESTDIR=$(3) + endef endif diff -r 13628d1d41e2 -r d862fd40cc42 src/gl2ps.mk --- a/src/gl2ps.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/gl2ps.mk Sun Sep 20 11:57:01 2020 +0200 @@ -25,72 +25,74 @@ endef ifeq ($(MXE_SYSTEM),msvc) - define $(PKG)_BUILD - cd '$(1)' && cmake \ - $($(PKG)_CMAKE_FLAGS) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DPNG_NAMES=png16 \ - . - cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake - cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake DESTDIR='$(3)' install - endef + define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DPNG_NAMES=png16 \ + . + cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake + cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake DESTDIR='$(3)' install + endef else ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - define $(PKG)_BUILD - mkdir '$(1)/.build' - cd '$(1)' && autoreconf --force - cd '$(1)/.build' && ../configure \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - LIBS=-lopengl32 \ - && $(CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' LDFLAGS='-no-undefined -L$(HOST_LIBDIR)' - $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)' - endef + define $(PKG)_BUILD + mkdir '$(1)/.build' + cd '$(1)' && autoreconf --force + cd '$(1)/.build' && ../configure \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + LIBS=-lopengl32 \ + && $(CONFIGURE_POST_HOOK) + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' LDFLAGS='-no-undefined -L$(HOST_LIBDIR)' + $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)' + endef else - ifeq ($(MXE_SYSTEM),mingw) - define $(PKG)_BUILD - cd '$(1)' && cmake \ - $($(PKG)_CMAKE_FLAGS) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - . - $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + ifeq ($(MXE_SYSTEM),mingw) + define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 - # native mingw build doesnt want to install the files, even - # though it logs that it did - if [ x$(MXE_NATIVE_MINGW_BUILD) = xyes ]; then \ - $(INSTALL) -d '$(3)$(HOST_LIBDIR)'; \ - $(INSTALL) -m644 '$(1)/libgl2ps.a' '$(3)$(HOST_LIBDIR)'; \ - $(INSTALL) -m644 '$(1)/libgl2ps.dll.a' '$(3)$(HOST_LIBDIR)'; \ - $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \ - $(INSTALL) -m644 '$(1)/libgl2ps.dll' '$(3)$(HOST_BINDIR)'; \ - $(INSTALL) -d '$(3)$(HOST_INCDIR)'; \ - $(INSTALL) -m644 '$(1)/gl2ps.h' '$(3)$(HOST_INCDIR)'; \ - else \ - $(MAKE) -C '$(1)' -j 1 VERBOSE=1 DESTDIR='$(3)' install; \ - if [ $(MXE_SYSTEM) = mingw ]; then \ - echo "Install dll"; \ - $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \ - $(INSTALL) '$(3)$(HOST_LIBDIR)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \ - rm -f '$(3)$(HOST_LIBDIR)/libgl2ps.dll'; \ - fi; \ - fi - endef - else - define $(PKG)_BUILD - mkdir '$(1)/.build' - cd '$(1)' && aclocal && libtoolize && autoreconf --force - cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - --prefix='$(HOST_PREFIX)' \ - && $(CONFIGURE_POST_HOOK) + # native mingw build doesnt want to install the files, even + # though it logs that it did + if [ x$(MXE_NATIVE_MINGW_BUILD) = xyes ]; then \ + $(INSTALL) -d '$(3)$(HOST_LIBDIR)'; \ + $(INSTALL) -m644 '$(1)/libgl2ps.a' '$(3)$(HOST_LIBDIR)'; \ + $(INSTALL) -m644 '$(1)/libgl2ps.dll.a' '$(3)$(HOST_LIBDIR)'; \ + $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \ + $(INSTALL) -m644 '$(1)/libgl2ps.dll' '$(3)$(HOST_BINDIR)'; \ + $(INSTALL) -d '$(3)$(HOST_INCDIR)'; \ + $(INSTALL) -m644 '$(1)/gl2ps.h' '$(3)$(HOST_INCDIR)'; \ + else \ + $(MAKE) -C '$(1)' -j 1 VERBOSE=1 DESTDIR='$(3)' install; \ + if [ $(MXE_SYSTEM) = mingw ]; then \ + echo "Install dll"; \ + $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \ + $(INSTALL) '$(3)$(HOST_LIBDIR)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \ + rm -f '$(3)$(HOST_LIBDIR)/libgl2ps.dll'; \ + fi; \ + fi + endef + else + define $(PKG)_BUILD + mkdir '$(1)/.build' + cd '$(1)' && aclocal && libtoolize && autoreconf --force + cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + && $(CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' - $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)' - endef - endif + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' + $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)' + endef + endif endif diff -r 13628d1d41e2 -r d862fd40cc42 src/hdf5.mk --- a/src/hdf5.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/hdf5.mk Sun Sep 20 11:57:01 2020 +0200 @@ -16,83 +16,84 @@ endef ifeq ($(MXE_SYSTEM),mingw) - ifneq ($(MXE_NATIVE_BUILD),yes) - $(PKG)_CROSS_CONFIG_OPTIONS := \ - -DHDF5_USE_PREGEN=ON \ - -DHAVE_IOEO_EXITCODE=0 \ - -DH5_LDOUBLE_TO_LONG_SPECIAL_RUN=1 \ - -DH5_LDOUBLE_TO_LONG_SPECIAL_RUN__TRYRUN_OUTPUT="" \ - -DH5_LONG_TO_LDOUBLE_SPECIAL_RUN=1 \ - -DH5_LONG_TO_LDOUBLE_SPECIAL_RUN__TRYRUN_OUTPUT="" \ - -DH5_LDOUBLE_TO_LLONG_ACCURATE_RUN=0 \ - -DH5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT="" \ - -DH5_LLONG_TO_LDOUBLE_CORRECT_RUN=0 \ - -DH5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT="" \ - -DH5_DISABLE_SOME_LDOUBLE_CONV_RUN=1 \ - -DH5_DISABLE_SOME_LDOUBLE_CONV_RUN__TRYRUN_OUTPUT="" \ - -DH5_NO_ALIGNMENT_RESTRICTIONS_RUN=0 \ - -DH5_NO_ALIGNMENT_RESTRICTIONS_RUN__TRYRUN_OUTPUT="" \ - -DH5_PRINTF_LL_TEST_RUN=1 \ - -DH5_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT="" \ - -DTEST_LFS_WORKS_RUN=0 - endif + ifneq ($(MXE_NATIVE_BUILD),yes) + $(PKG)_CROSS_CONFIG_OPTIONS := \ + -DHDF5_USE_PREGEN=ON \ + -DHAVE_IOEO_EXITCODE=0 \ + -DH5_LDOUBLE_TO_LONG_SPECIAL_RUN=1 \ + -DH5_LDOUBLE_TO_LONG_SPECIAL_RUN__TRYRUN_OUTPUT="" \ + -DH5_LONG_TO_LDOUBLE_SPECIAL_RUN=1 \ + -DH5_LONG_TO_LDOUBLE_SPECIAL_RUN__TRYRUN_OUTPUT="" \ + -DH5_LDOUBLE_TO_LLONG_ACCURATE_RUN=0 \ + -DH5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT="" \ + -DH5_LLONG_TO_LDOUBLE_CORRECT_RUN=0 \ + -DH5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT="" \ + -DH5_DISABLE_SOME_LDOUBLE_CONV_RUN=1 \ + -DH5_DISABLE_SOME_LDOUBLE_CONV_RUN__TRYRUN_OUTPUT="" \ + -DH5_NO_ALIGNMENT_RESTRICTIONS_RUN=0 \ + -DH5_NO_ALIGNMENT_RESTRICTIONS_RUN__TRYRUN_OUTPUT="" \ + -DH5_PRINTF_LL_TEST_RUN=1 \ + -DH5_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT="" \ + -DTEST_LFS_WORKS_RUN=0 + endif endif define $(PKG)_BUILD - if test x$(MXE_SYSTEM) = xmingw; then \ - mkdir '$(1)/pregen'; \ - case '$(TARGET)' in \ - x86_64-w64-mingw32) \ - cp '$(1)/src/H5Tinit.c.mingw64' '$(1)/pregen/H5Tinit.c' & \ - cp '$(1)/src/H5lib_settings.c.mingw64' '$(1)/pregen/H5lib_settings.c' \ - ;; \ - i686-w64-mingw32) \ - cp '$(1)/src/H5Tinit.c.mingw32' '$(1)/pregen/H5Tinit.c' & \ - cp '$(1)/src/H5lib_settings.c.mingw32' '$(1)/pregen/H5lib_settings.c' \ - ;; \ - i686-pc-mingw32) \ - cp '$(1)/src/H5Tinit.c.mingw32' '$(1)/pregen/H5Tinit.c' & \ - cp '$(1)/src/H5lib_settings.c.mingw32' '$(1)/pregen/H5lib_settings.c' \ - ;; \ - esac; \ - fi + if test x$(MXE_SYSTEM) = xmingw; then \ + mkdir '$(1)/pregen'; \ + case '$(TARGET)' in \ + x86_64-w64-mingw32) \ + cp '$(1)/src/H5Tinit.c.mingw64' '$(1)/pregen/H5Tinit.c' & \ + cp '$(1)/src/H5lib_settings.c.mingw64' '$(1)/pregen/H5lib_settings.c' \ + ;; \ + i686-w64-mingw32) \ + cp '$(1)/src/H5Tinit.c.mingw32' '$(1)/pregen/H5Tinit.c' & \ + cp '$(1)/src/H5lib_settings.c.mingw32' '$(1)/pregen/H5lib_settings.c' \ + ;; \ + i686-pc-mingw32) \ + cp '$(1)/src/H5Tinit.c.mingw32' '$(1)/pregen/H5Tinit.c' & \ + cp '$(1)/src/H5lib_settings.c.mingw32' '$(1)/pregen/H5lib_settings.c' \ + ;; \ + esac; \ + fi - mkdir '$(1)/.build' + mkdir '$(1)/.build' - cd '$(1)/.build' && cmake .. -G "Unix Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${prefix} \ - $($(PKG)_CMAKE_FLAGS) \ - -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DHDF5_INSTALL_BIN_DIR='$(HOST_BINDIR)' \ - -DHDF5_INSTALL_LIB_DIR='$(HOST_LIBDIR)' \ - -DHDF5_INSTALL_INCLUDE_DIR='$(HOST_INCDIR)' \ - -DHDF5_INSTALL_DATA_DIR='$(HOST_PREFIX)/share' \ - -DHDF5_BUILD_CPP_LIB=OFF \ - -DHDF5_BUILD_HL_LIB=ON \ - -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \ - -DHDF5_ENABLE_SZIP_SUPPORT=OFF \ - -DHDF5_ENABLE_SZIP_ENCODING=OFF \ - -DBUILD_TESTING=OFF \ - $($(PKG)_CROSS_CONFIG_OPTIONS) \ - -DHDF5_USE_PREGEN_DIR='$(1)/pregen' + cd '$(1)/.build' && cmake .. -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DHDF5_INSTALL_BIN_DIR='$(HOST_BINDIR)' \ + -DHDF5_INSTALL_LIB_DIR='$(HOST_LIBDIR)' \ + -DHDF5_INSTALL_INCLUDE_DIR='$(HOST_INCDIR)' \ + -DHDF5_INSTALL_DATA_DIR='$(HOST_PREFIX)/share' \ + -DHDF5_BUILD_CPP_LIB=OFF \ + -DHDF5_BUILD_HL_LIB=ON \ + -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \ + -DHDF5_ENABLE_SZIP_SUPPORT=OFF \ + -DHDF5_ENABLE_SZIP_ENCODING=OFF \ + -DBUILD_TESTING=OFF \ + $($(PKG)_CROSS_CONFIG_OPTIONS) \ + -DHDF5_USE_PREGEN_DIR='$(1)/pregen' - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' - $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)' + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' + $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)' - # FIXME: Change the build rule to create the shared libs with the prefix - if test x$(MXE_SYSTEM) = xmingw; then \ - mv '$(3)/$(HOST_LIBDIR)/hdf5.lib' '$(3)/$(HOST_LIBDIR)/libhdf5.lib'; \ - mv '$(3)/$(HOST_LIBDIR)/hdf5_tools.lib' '$(3)/$(HOST_LIBDIR)/libhdf5_tools.lib'; \ - mv '$(3)/$(HOST_LIBDIR)/hdf5_hl.lib' '$(3)/$(HOST_LIBDIR)/libhdf5_hl.lib'; \ - fi - - # Remove version suffix from pkg-config files - mv '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5-$($(PKG)_VERSION).pc' '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5.pc' - mv '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5_hl-$($(PKG)_VERSION).pc' '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5_hl.pc' + # FIXME: Change the build rule to create the shared libs with the prefix + if test x$(MXE_SYSTEM) = xmingw; then \ + mv '$(3)/$(HOST_LIBDIR)/hdf5.lib' '$(3)/$(HOST_LIBDIR)/libhdf5.lib'; \ + mv '$(3)/$(HOST_LIBDIR)/hdf5_tools.lib' '$(3)/$(HOST_LIBDIR)/libhdf5_tools.lib'; \ + mv '$(3)/$(HOST_LIBDIR)/hdf5_hl.lib' '$(3)/$(HOST_LIBDIR)/libhdf5_hl.lib'; \ + fi + + # Remove version suffix from pkg-config files + mv '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5-$($(PKG)_VERSION).pc' '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5.pc' + mv '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5_hl-$($(PKG)_VERSION).pc' '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5_hl.pc' - if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ - rm -rf '$(3)$(HOST_PREFIX)/share/hdf5_examples'; \ - fi + if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ + rm -rf '$(3)$(HOST_PREFIX)/share/hdf5_examples'; \ + fi endef diff -r 13628d1d41e2 -r d862fd40cc42 src/lapack.mk --- a/src/lapack.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/lapack.mk Sun Sep 20 11:57:01 2020 +0200 @@ -10,19 +10,23 @@ $(PKG)_DEPS := blas ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="$(HOST_BINDIR)/libblas.dll $(HOST_BINDIR)/libxerbla.dll" + $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="$(HOST_BINDIR)/libblas.dll $(HOST_BINDIR)/libxerbla.dll" else -ifeq ($(MXE_WINDOWS_BUILD),yes) - $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="-L$(HOST_PREFIX)/lib -lblas -lxerbla" -DBLAS_LINKER_FLAGS="-L$(HOST_PREFIX)/lib -lblas -lxerbla" - $(PKG)_BLAS_LIBS := -lblas -lxerbla -else - $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="-L$(HOST_PREFIX)/lib -lblas" -DBLAS_LINKER_FLAGS="-L$(HOST_PREFIX)/lib -lblas" - $(PKG)_BLAS_LIBS := -lblas -endif + ifeq ($(MXE_WINDOWS_BUILD),yes) + $(PKG)_BLAS_CONFIG_OPTS := \ + -DBLAS_LIBRARIES="-L$(HOST_PREFIX)/lib -lblas -lxerbla" \ + -DBLAS_LINKER_FLAGS="-L$(HOST_PREFIX)/lib -lblas -lxerbla" + $(PKG)_BLAS_LIBS := -lblas -lxerbla + else + $(PKG)_BLAS_CONFIG_OPTS := \ + -DBLAS_LIBRARIES="-L$(HOST_PREFIX)/lib -lblas" \ + -DBLAS_LINKER_FLAGS="-L$(HOST_PREFIX)/lib -lblas" + $(PKG)_BLAS_LIBS := -lblas + endif endif ifeq ($(ENABLE_FORTRAN_INT64),yes) - $(PKG)_DEFAULT_INTEGER_8_FLAG := -fdefault-integer-8 + $(PKG)_DEFAULT_INTEGER_8_FLAG := -fdefault-integer-8 endif define $(PKG)_UPDATE @@ -32,39 +36,40 @@ endef ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) -define $(PKG)_BUILD - cd '$(1)' && \ - cp INSTALL/make.inc.gfortran make.inc && \ - sed -i -e 's/\(FORTRAN[ ]*\)=.*/\1= $(MXE_F77)/' \ - -e 's/\(LOADER[ ]*\)=.*/\1= $(MXE_F77)/' \ - -e 's/\(CC[ ]*\)=.*/\1= $(MXE_CC)/' \ - -e 's/\(CFLAGS[ ]*\)=.*/\1= -O2/' make.inc + define $(PKG)_BUILD + cd '$(1)' && \ + cp INSTALL/make.inc.gfortran make.inc && \ + sed -i -e 's/\(FORTRAN[ ]*\)=.*/\1= $(MXE_F77)/' \ + -e 's/\(LOADER[ ]*\)=.*/\1= $(MXE_F77)/' \ + -e 's/\(CC[ ]*\)=.*/\1= $(MXE_CC)/' \ + -e 's/\(CFLAGS[ ]*\)=.*/\1= -O2/' make.inc - $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 lapacklib + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 lapacklib - if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/liblapack.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' $($(PKG)_BLAS_LIBS); \ - fi + if [ $(BUILD_SHARED) = yes ]; then \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/liblapack.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' $($(PKG)_BLAS_LIBS); \ + fi - $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' - $(SED) -e 's/@LAPACK_VERSION@/$($(PKG)_VERSION)/' \ - -e 's,@prefix@,$(HOST_PREFIX),' \ - -e 's,@libdir@,$${prefix}/lib,' '$(1)/lapack.pc.in' > '$(1)/lapack.pc' - $(INSTALL) '$(1)/lapack.pc' '$(HOST_LIBDIR)/pkgconfig/' + $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' + $(SED) -e 's/@LAPACK_VERSION@/$($(PKG)_VERSION)/' \ + -e 's,@prefix@,$(HOST_PREFIX),' \ + -e 's,@libdir@,$${prefix}/lib,' '$(1)/lapack.pc.in' > '$(1)/lapack.pc' + $(INSTALL) '$(1)/lapack.pc' '$(HOST_LIBDIR)/pkgconfig/' -endef + endef else -define $(PKG)_BUILD - mkdir '$(1)/build' - cd '$(1)/build' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_AR='$(MXE_AR)' \ - -DCMAKE_RANLIB='$(MXE_RANLIB)' \ - -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \ - -DBUILD_DEPRECATED=ON \ - -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \ - $($(PKG)_BLAS_CONFIG_OPTS) \ - $(1) - $(MAKE) -C '$(1)/build/SRC' -j '$(JOBS)' VERBOSE=1 install DESTDIR='$(3)' -endef + define $(PKG)_BUILD + mkdir '$(1)/build' + cd '$(1)/build' && cmake \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_AR='$(MXE_AR)' \ + -DCMAKE_RANLIB='$(MXE_RANLIB)' \ + -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \ + -DBUILD_DEPRECATED=ON \ + -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \ + $($(PKG)_BLAS_CONFIG_OPTS) \ + $(1) + $(MAKE) -C '$(1)/build/SRC' -j '$(JOBS)' VERBOSE=1 install DESTDIR='$(3)' + endef endif diff -r 13628d1d41e2 -r d862fd40cc42 src/libical.mk --- a/src/libical.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/libical.mk Sun Sep 20 11:57:01 2020 +0200 @@ -18,6 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && mkdir build cd '$(1)/build' && cmake .. \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DSTATIC_LIBRARY=true \ -DHAVE_PTHREAD_H=false \ diff -r 13628d1d41e2 -r d862fd40cc42 src/libproxy.mk --- a/src/libproxy.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/libproxy.mk Sun Sep 20 11:57:01 2020 +0200 @@ -23,6 +23,7 @@ $($(PKG)_CMAKE_FLAGS) \ -DWITH_KDE=no \ -DBUILD_TESTING=no \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ . diff -r 13628d1d41e2 -r d862fd40cc42 src/llvm.mk --- a/src/llvm.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/llvm.mk Sun Sep 20 11:57:01 2020 +0200 @@ -18,88 +18,90 @@ endef ifeq ($(MXE_NATIVE_BUILD),yes) - ifeq ($(MXE_SYSTEM),gnu-linux) - define $(PKG)_BUILD - mkdir '$(1)/.build' && cd '$(1)/.build' && cmake .. \ - $($(PKG)_CMAKE_FLAGS) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DLLVM_BUILD_LLVM_DYLIB=On \ - -DLLVM_LINK_LLVM_DYLIB=On \ - -DLLVM_VERSION_SUFFIX= \ - -DLLVM_TARGETS_TO_BUILD='X86' \ - -DLLVM_BUILD_EXAMPLES=Off \ - -DLLVM_INCLUDE_EXAMPLES=Off \ - -DLLVM_BUILD_TESTS=Off \ - -DLLVM_INCLUDE_TESTS=Off \ - -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_BUILD_DOCS=OFF \ - -DLLVM_ENABLE_DOXYGEN=OFF \ - -DLLVM_ENABLE_BACKTRACES=Off + ifeq ($(MXE_SYSTEM),gnu-linux) + define $(PKG)_BUILD + mkdir '$(1)/.build' && cd '$(1)/.build' && cmake .. \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DLLVM_BUILD_LLVM_DYLIB=On \ + -DLLVM_LINK_LLVM_DYLIB=On \ + -DLLVM_VERSION_SUFFIX= \ + -DLLVM_TARGETS_TO_BUILD='X86' \ + -DLLVM_BUILD_EXAMPLES=Off \ + -DLLVM_INCLUDE_EXAMPLES=Off \ + -DLLVM_BUILD_TESTS=Off \ + -DLLVM_INCLUDE_TESTS=Off \ + -DLLVM_INCLUDE_GO_TESTS=OFF \ + -DLLVM_INCLUDE_DOCS=OFF \ + -DLLVM_BUILD_DOCS=OFF \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DLLVM_ENABLE_BACKTRACES=Off - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' - endef - else - define $(PKG)_BUILD - echo "unsupported LLVM configuration" 1>&2 - exit 1 - endef - endif + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' + endef + else + define $(PKG)_BUILD + echo "unsupported LLVM configuration" 1>&2 + exit 1 + endef + endif else - ifeq ($(ENABLE_WINDOWS_64),yes) - ## WTF, setting LLVM_TARGETS_TO_BUILD to X64_64 doesn't work here? - $(PKG)_SYSDEP_CMAKE_OPTIONS += \ - -DLLVM_DEFAULT_TARGET_TRIPLE='x86_64-pc-win32' \ - -DLLVM_TARGETS_TO_BUILD='X86' - else - $(PKG)_SYSDEP_CMAKE_OPTIONS += \ - -DLLVM_DEFAULT_TARGET_TRIPLE='x86-pc-win32' \ - -DLLVM_TARGETS_TO_BUILD='X86' - endif - ifeq ($(USE_CCACHE),yes) - $(PKG)_CCACHE_OPTIONS += \ - -DLLVM_CCACHE_BUILD=On - endif + ifeq ($(ENABLE_WINDOWS_64),yes) + ## WTF, setting LLVM_TARGETS_TO_BUILD to X64_64 doesn't work here? + $(PKG)_SYSDEP_CMAKE_OPTIONS += \ + -DLLVM_DEFAULT_TARGET_TRIPLE='x86_64-pc-win32' \ + -DLLVM_TARGETS_TO_BUILD='X86' + else + $(PKG)_SYSDEP_CMAKE_OPTIONS += \ + -DLLVM_DEFAULT_TARGET_TRIPLE='x86-pc-win32' \ + -DLLVM_TARGETS_TO_BUILD='X86' + endif + ifeq ($(USE_CCACHE),yes) + $(PKG)_CCACHE_OPTIONS += \ + -DLLVM_CCACHE_BUILD=On + endif - define $(PKG)_BUILD - mkdir '$(1)/.build' - cd '$(1)/.build' && 'cmake' .. \ - $($(PKG)_CMAKE_FLAGS) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DLLVM_BUILD_TOOLS=OFF \ - -DLLVM_BUILD_LLVM_DYLIB=On \ - -DLLVM_LINK_LLVM_DYLIB=On \ - -DLLVM_VERSION_SUFFIX= \ - $($(PKG)_SYSDEP_CMAKE_OPTIONS) \ - -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \ - -DLLVM_BUILD_EXAMPLES=Off \ - -DLLVM_INCLUDE_EXAMPLES=Off \ - -DLLVM_BUILD_TESTS=Off \ - -DLLVM_INCLUDE_TESTS=Off \ - -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_ENABLE_BACKTRACES=Off \ - -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_BUILD_DOCS=OFF \ - -DLLVM_ENABLE_DOXYGEN=OFF \ - -DLLVM_ENABLE_OCAMLDOC=OFF \ - -DLLVM_ENABLE_BINDINGS=OFF \ - -DLLVM_ENABLE_SPHINX=OFF \ - -DLLVM_BUILD_RUNTIME=OFF \ - -DLLVM_BUILD_RUNTIMES=OFF \ - -DLLVM_INCLUDE_RUNTIMES=OFF \ - $($(PKG)_CCACHE_OPTIONS) + define $(PKG)_BUILD + mkdir '$(1)/.build' + cd '$(1)/.build' && 'cmake' .. \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DLLVM_BUILD_TOOLS=OFF \ + -DLLVM_BUILD_LLVM_DYLIB=On \ + -DLLVM_LINK_LLVM_DYLIB=On \ + -DLLVM_VERSION_SUFFIX= \ + $($(PKG)_SYSDEP_CMAKE_OPTIONS) \ + -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)'" \ + -DLLVM_BUILD_EXAMPLES=Off \ + -DLLVM_INCLUDE_EXAMPLES=Off \ + -DLLVM_BUILD_TESTS=Off \ + -DLLVM_INCLUDE_TESTS=Off \ + -DLLVM_INCLUDE_GO_TESTS=OFF \ + -DLLVM_ENABLE_BACKTRACES=Off \ + -DLLVM_INCLUDE_DOCS=OFF \ + -DLLVM_BUILD_DOCS=OFF \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DLLVM_ENABLE_OCAMLDOC=OFF \ + -DLLVM_ENABLE_BINDINGS=OFF \ + -DLLVM_ENABLE_SPHINX=OFF \ + -DLLVM_BUILD_RUNTIME=OFF \ + -DLLVM_BUILD_RUNTIMES=OFF \ + -DLLVM_INCLUDE_RUNTIMES=OFF \ + $($(PKG)_CCACHE_OPTIONS) - $(MAKE) -C '$(1)/.build' -j $(JOBS) LLVMSupport - $(MAKE) -C '$(1)/.build' -j $(JOBS) llvm-config - $(MAKE) -C '$(1)/.build' -j $(JOBS) install DESTDIR='$(3)' + $(MAKE) -C '$(1)/.build' -j $(JOBS) LLVMSupport + $(MAKE) -C '$(1)/.build' -j $(JOBS) llvm-config + $(MAKE) -C '$(1)/.build' -j $(JOBS) install DESTDIR='$(3)' - # create symlink for shared library so that llvm-config can find it - cd '$(3)/$(HOST_BINDIR)' && ln -s LLVM.dll LLVM-$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION))).dll + # create symlink for shared library so that llvm-config can find it + cd '$(3)/$(HOST_BINDIR)' && ln -s LLVM.dll LLVM-$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION))).dll - # install native llvm-config in HOST_BINDIR because it won't find the libs otherwise - # FIXME: Some of the configuration flags are hard coded into llvm-config with a patch. - # If the configuration flags are changed, the patch might have to be adapted. - $(INSTALL) -d '$(HOST_BINDIR)' - $(INSTALL) -m755 '$(1)/.build/NATIVE/bin/llvm-config' '$(HOST_BINDIR)/$(MXE_TOOL_PREFIX)llvm-config' - endef + # install native llvm-config in HOST_BINDIR because it won't find the libs otherwise + # FIXME: Some of the configuration flags are hard coded into llvm-config with a patch. + # If the configuration flags are changed, the patch might have to be adapted. + $(INSTALL) -d '$(HOST_BINDIR)' + $(INSTALL) -m755 '$(1)/.build/NATIVE/bin/llvm-config' '$(HOST_BINDIR)/$(MXE_TOOL_PREFIX)llvm-config' + endef endif diff -r 13628d1d41e2 -r d862fd40cc42 src/of-dicom.mk --- a/src/of-dicom.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/of-dicom.mk Sun Sep 20 11:57:01 2020 +0200 @@ -5,7 +5,7 @@ $(PKG)_IGNORE := $(PKG)_VERSION := 0.4.0 $(PKG)_CHECKSUM := 23c207e1fbb8afaf5c9c6519faaa5be7aa973830 -$(PKG)_REMOTE_SUBDIR := +$(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := dicom-$($(PKG)_VERSION) $(PKG)_FILE := dicom-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download @@ -16,9 +16,9 @@ endif ifeq ($(MXE_NATIVE_BUILD),no) -$(PKG)_OPTIONS := CMAKE_BINARY="cmake -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'" + $(PKG)_OPTIONS := CMAKE_BINARY="cmake $(CMAKE_CCACHE_FLAGS) -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'" else -$(PKG)_OPTIONS := + $(PKG)_OPTIONS := endif define $(PKG)_UPDATE diff -r 13628d1d41e2 -r d862fd40cc42 src/openal.mk --- a/src/openal.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/openal.mk Sun Sep 20 11:57:01 2020 +0200 @@ -18,6 +18,7 @@ define $(PKG)_BUILD cd '$(1)/build' && cmake .. \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DEXAMPLES=FALSE $(MAKE) -C '$(1)/build' -j '$(JOBS)' install diff -r 13628d1d41e2 -r d862fd40cc42 src/opencv.mk --- a/src/opencv.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/opencv.mk Sun Sep 20 11:57:01 2020 +0200 @@ -23,40 +23,41 @@ # build mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - --debug-output \ - -DBUILD_opencv_dnn=OFF \ - -DBUILD_opencv_java=OFF \ - -DBUILD_opencv_python=OFF \ - -DWITH_QT=OFF \ - -DWITH_OPENGL=ON \ - -DWITH_GSTREAMER=OFF \ - -DWITH_GTK=OFF \ - -DWITH_VIDEOINPUT=ON \ - -DWITH_XINE=OFF \ - -DWITH_PYTHON=OFF \ - -DWITH_PROTOBUF=OFF \ - -DWITH_CUDA=OFF \ - -DBUILD_opencv_apps=OFF \ - -DBUILD_DOCS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_PACKAGE=OFF \ - -DBUILD_PERF_TESTS=OFF \ - -DBUILD_TESTS=OFF \ - -DBUILD_WITH_DEBUG_INFO=OFF \ - -DBUILD_FAT_JAVA_LIB=OFF \ - -DBUILD_ZLIB=OFF \ - -DBUILD_TIFF=OFF \ - -DBUILD_JASPER=OFF \ - -DBUILD_JPEG=OFF \ - -DBUILD_WEBP=ON \ - -DBUILD_PROTOBUF=OFF \ - -DPROTOBUF_UPDATE_FILES=ON \ - -DBUILD_PNG=OFF \ - -DBUILD_OPENEXR=OFF \ - -DCMAKE_VERBOSE=ON \ - -DCMAKE_CXX_STANDARD=11 \ - -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0500' + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + --debug-output \ + -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_java=OFF \ + -DBUILD_opencv_python=OFF \ + -DWITH_QT=OFF \ + -DWITH_OPENGL=ON \ + -DWITH_GSTREAMER=OFF \ + -DWITH_GTK=OFF \ + -DWITH_VIDEOINPUT=ON \ + -DWITH_XINE=OFF \ + -DWITH_PYTHON=OFF \ + -DWITH_PROTOBUF=OFF \ + -DWITH_CUDA=OFF \ + -DBUILD_opencv_apps=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PACKAGE=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_WITH_DEBUG_INFO=OFF \ + -DBUILD_FAT_JAVA_LIB=OFF \ + -DBUILD_ZLIB=OFF \ + -DBUILD_TIFF=OFF \ + -DBUILD_JASPER=OFF \ + -DBUILD_JPEG=OFF \ + -DBUILD_WEBP=ON \ + -DBUILD_PROTOBUF=OFF \ + -DPROTOBUF_UPDATE_FILES=ON \ + -DBUILD_PNG=OFF \ + -DBUILD_OPENEXR=OFF \ + -DCMAKE_VERBOSE=ON \ + -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0500' # install $(MAKE) -C '$(1)/build' -j '$(JOBS)' VERBOSE=1 diff -r 13628d1d41e2 -r d862fd40cc42 src/openexr.mk --- a/src/openexr.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/openexr.mk Sun Sep 20 11:57:01 2020 +0200 @@ -17,40 +17,41 @@ endef ifeq ($(MXE_NATIVE_BUILD),yes) -define $(PKG)_BUILD - mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_TESTING='OFF' \ - -DINSTALL_OPENEXR_DOCS='OFF' \ - -DINSTALL_OPENEXR_EXAMPLES='OFF' \ - -DOPENEXR_BUILD_UTILS='OFF' \ - -DPYILMBASE_ENABLE='OFF' \ - -DOPENEXR_VIEWERS_ENABLE='OFF' + define $(PKG)_BUILD + mkdir '$(1)/build' + cd '$(1)/build' && cmake .. \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DBUILD_TESTING='OFF' \ + -DINSTALL_OPENEXR_DOCS='OFF' \ + -DINSTALL_OPENEXR_EXAMPLES='OFF' \ + -DOPENEXR_BUILD_UTILS='OFF' \ + -DPYILMBASE_ENABLE='OFF' \ + -DOPENEXR_VIEWERS_ENABLE='OFF' - $(MAKE) -C '$(1)/build' -j '$(JOBS)' VERBOSE=1 - $(MAKE) -C '$(1)/build' -j 1 install DESTDIR='$(3)' -endef - + $(MAKE) -C '$(1)/build' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)/build' -j 1 install DESTDIR='$(3)' + endef else -define $(PKG)_BUILD - mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_TESTING='OFF' \ - -DCMAKE_VERBOSE_MAKEFILE='ON' \ - -DPYILMBASE_ENABLE='OFF' \ - -DINSTALL_OPENEXR_DOCS='OFF' \ - -DINSTALL_OPENEXR_EXAMPLES='OFF' \ - -DOPENEXR_BUILD_UTILS='OFF' \ - -DOPENEXR_VIEWERS_ENABLE='OFF' \ - -DOPENEXR_INSTALL_PKG_CONFIG='ON' \ - -DILMBASE_LIB_SUFFIX='' \ - -DOPENEXR_LIB_SUFFIX='' \ - -DCMAKE_CXX_STANDARD=11 \ - -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0500' + define $(PKG)_BUILD + mkdir '$(1)/build' + cd '$(1)/build' && cmake .. \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DBUILD_TESTING='OFF' \ + -DCMAKE_VERBOSE_MAKEFILE='ON' \ + -DPYILMBASE_ENABLE='OFF' \ + -DINSTALL_OPENEXR_DOCS='OFF' \ + -DINSTALL_OPENEXR_EXAMPLES='OFF' \ + -DOPENEXR_BUILD_UTILS='OFF' \ + -DOPENEXR_VIEWERS_ENABLE='OFF' \ + -DOPENEXR_INSTALL_PKG_CONFIG='ON' \ + -DILMBASE_LIB_SUFFIX='' \ + -DOPENEXR_LIB_SUFFIX='' \ + -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0500' - $(MAKE) -C '$(1)/build' -j '$(JOBS)' VERBOSE=1 - $(MAKE) -C '$(1)/build' -j 1 install DESTDIR='$(3)' -endef + $(MAKE) -C '$(1)/build' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)/build' -j 1 install DESTDIR='$(3)' + endef endif diff -r 13628d1d41e2 -r d862fd40cc42 src/openscenegraph.mk --- a/src/openscenegraph.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/openscenegraph.mk Sun Sep 20 11:57:01 2020 +0200 @@ -26,6 +26,7 @@ define $(PKG)_BUILD mkdir -p '$(1)/.build' cd '$(1)/.build' && cmake .. \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS \ -DCMAKE_HAVE_PTHREAD_H=ON \ diff -r 13628d1d41e2 -r d862fd40cc42 src/physfs.mk --- a/src/physfs.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/physfs.mk Sun Sep 20 11:57:01 2020 +0200 @@ -18,6 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && cmake . \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DPHYSFS_BUILD_SHARED=FALSE \ -DPHYSFS_INTERNAL_ZLIB=FALSE \ diff -r 13628d1d41e2 -r d862fd40cc42 src/qhull.mk --- a/src/qhull.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/qhull.mk Sun Sep 20 11:57:01 2020 +0200 @@ -12,9 +12,9 @@ $(PKG)_CMAKE_OPTS := ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles" - endif + ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles" + endif endif define $(PKG)_UPDATE @@ -27,7 +27,8 @@ mkdir '$(1)/../.build' cd '$(1)/../.build' && cmake \ $($(PKG)_CMAKE_OPTS) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DDOC_INSTALL_DIR='$(1)' \ ../$($(PKG)_SUBDIR) make -C $(1)/../.build -j $(JOBS) diff -r 13628d1d41e2 -r d862fd40cc42 src/qjson.mk --- a/src/qjson.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/qjson.mk Sun Sep 20 11:57:01 2020 +0200 @@ -20,6 +20,7 @@ echo '$(MXE_QMAKE)' mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLIBTYPE=STATIC diff -r 13628d1d41e2 -r d862fd40cc42 src/rapidjson.mk --- a/src/rapidjson.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/rapidjson.mk Sun Sep 20 11:57:01 2020 +0200 @@ -19,11 +19,13 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && \ - cmake -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DRAPIDJSON_BUILD_DOC=No \ - -DRAPIDJSON_BUILD_EXAMPLES=No \ - -DRAPIDJSON_BUILD_TESTS=No \ - '$(1)' + cmake \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DRAPIDJSON_BUILD_DOC=Off \ + -DRAPIDJSON_BUILD_EXAMPLES=Off \ + -DRAPIDJSON_BUILD_TESTS=Off \ + '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' DESTDIR='$(3)' install endef diff -r 13628d1d41e2 -r d862fd40cc42 src/suitesparse.mk --- a/src/suitesparse.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/suitesparse.mk Sun Sep 20 11:57:01 2020 +0200 @@ -40,9 +40,6 @@ CXX='$(CCACHE) $(MXE_CXX)' \ CPLUSPLUS='$(CCACHE) $(MXE_CXX)' \ F77='$(CCACHE) $(MXE_F77)' - $(PKG)_CMAKE_CCACHE_OPTS := -DCMAKE_CXX_COMPILER_LAUNCHER='$(CCACHE)' \ - -DCMAKE_C_COMPILER_LAUNCHER='$(CCACHE)' \ - -DCMAKE_Fortran_COMPILER_LAUNCHER='$(CCACHE)' else $(PKG)_COMPILER_OPTS := CC='$(MXE_CC)' \ CXX='$(MXE_CXX)' \ @@ -61,7 +58,7 @@ BLAS="-lblas -lgfortran" \ LAPACK='-llapack' \ CHOLMOD_CONFIG='-DNPARTITION' \ - CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $($(PKG)_CMAKE_CCACHE_OPTS)' + CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $(CMAKE_CCACHE_FLAGS)' ifeq ($(MXE_WINDOWS_BUILD),yes) $(PKG)_MAKE_OPTS += \ @@ -77,14 +74,14 @@ $(PKG)_METIS_CONFIG_FLAGS = -DCMAKE_VERBOSE_MAKEFILE=1 \ -DGKLIB_PATH=$(1)/metis-5.1.0/GKlib \ -DCMAKE_INSTALL_PREFIX=$(1) \ - -DSHARED=1 \ - $($(PKG)_CMAKE_CCACHE_OPTS) + -DSHARED=1 define $(PKG)_BUILD # build metis mkdir $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) cd $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) && \ cmake $(1)/metis-5.1.0 \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ $($(PKG)_METIS_CONFIG_FLAGS) $(MAKE) -C '$(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)' metis -j '$(JOBS)' diff -r 13628d1d41e2 -r d862fd40cc42 src/sundials-ida.mk --- a/src/sundials-ida.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/sundials-ida.mk Sun Sep 20 11:57:01 2020 +0200 @@ -34,6 +34,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && cmake \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DBUILD_ARKODE=OFF \ -DBUILD_CVODE=OFF \ diff -r 13628d1d41e2 -r d862fd40cc42 src/taglib.mk --- a/src/taglib.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/taglib.mk Sun Sep 20 11:57:01 2020 +0200 @@ -20,6 +20,7 @@ define $(PKG)_BUILD mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DENABLE_STATIC=ON $(MAKE) -C '$(1)/build' -j '$(JOBS)' install diff -r 13628d1d41e2 -r d862fd40cc42 src/vigra.mk --- a/src/vigra.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/vigra.mk Sun Sep 20 11:57:01 2020 +0200 @@ -23,6 +23,7 @@ $(SED) -i 's,\bSHARED\b,STATIC,' '$(1)/vigranumpy/test/CMakeLists.txt' mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLIBTYPE=STATIC \ -DVIGRA_STATIC_LIB=1 \ diff -r 13628d1d41e2 -r d862fd40cc42 src/vmime.mk --- a/src/vmime.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/vmime.mk Sun Sep 20 11:57:01 2020 +0200 @@ -19,6 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_AR='$(MXE_AR)' \ -DCMAKE_RANLIB='$(MXE_RANLIB)' \ diff -r 13628d1d41e2 -r d862fd40cc42 src/vtk.mk --- a/src/vtk.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/vtk.mk Sun Sep 20 11:57:01 2020 +0200 @@ -22,6 +22,8 @@ # first we need a native build to create the compile tools mkdir '$(1)/native_build' cd '$(1)/native_build' && cmake \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \ -DBUILD_TESTING=FALSE \ -DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \ -DVTK_USE_RENDERING=FALSE \ @@ -37,6 +39,7 @@ mkdir '$(1)/cross_build' cd '$(1)/cross_build' && cmake \ -C '$(1)/TryRunResults.cmake'\ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'\ -DBUILD_TESTING=FALSE\ -DVTKCompileTools_DIR='$(1)/native_build'\ @@ -51,5 +54,6 @@ -DVTK_USE_POSTGRES=TRUE\ -DVTK_USE_ODBC=TRUE\ .. + $(MAKE) -C '$(1)/cross_build' -j '$(JOBS)' install VERBOSE=1 endef diff -r 13628d1d41e2 -r d862fd40cc42 src/wt.mk --- a/src/wt.mk Sat Sep 19 17:35:15 2020 +0200 +++ b/src/wt.mk Sun Sep 20 11:57:01 2020 +0200 @@ -34,7 +34,9 @@ -DGM_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l GraphicsMagick++`" \ -DPANGO_FT2_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l pangoft2`" \ -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \ + $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ '$(1)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 endef