# HG changeset patch # User John Donoghue # Date 1646239347 18000 # Node ID 497afa9abf22b13d77879acd7b332ced68d7a345 # Parent 9df7598d4b908eb5f37e753b0a2ca6cbcd15ad3d * src/cmake.mk: force system detection of curl for cross compile (Bug #62115) (grafted from b319dc565a3a0990f2efafbc7d7f16f904595a2c) diff -r 9df7598d4b90 -r 497afa9abf22 src/cmake.mk --- a/src/cmake.mk Wed Feb 23 13:18:29 2022 -0500 +++ b/src/cmake.mk Wed Mar 02 11:42:27 2022 -0500 @@ -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 := bzip2 curl expat xz zlib $(PKG)_CMAKE_OPTS := ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -17,7 +17,10 @@ endif else ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_CMAKE_OPTS += -DKWSYS_LFS_WORKS=TRUE + $(PKG)_CMAKE_OPTS += -DKWSYS_LFS_WORKS=TRUE \ + -DCMAKE_USE_SYSTEM_CURL=ON \ + -DZLIB_WINAPI_EXITCODE=0 \ + -DZLIB_WINAPI_EXITCODE__TRYRUN_OUTPUT='' endif endif