From 113e378dc83966f6dc0792caf301f391f4b9de4c Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Tue, 29 Jul 2025 12:22:59 -0400 Subject: [PATCH 1/2] source build: fix openssl race in installing libssh2 --- deps/libssh2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/libssh2.mk b/deps/libssh2.mk index 3439ace10da16..d149820dd3fb2 100644 --- a/deps/libssh2.mk +++ b/deps/libssh2.mk @@ -5,7 +5,7 @@ LIBSSH2_TAR_URL = https://api.github.com/repos/libssh2/libssh2/tarball/$1 $(eval $(call git-external,libssh2,LIBSSH2,CMakeLists.txt,,$(SRCCACHE))) ifeq ($(USE_SYSTEM_OPENSSL), 0) -$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/openssl +$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: | install-openssl endif LIBSSH2_OPTS := $(CMAKE_COMMON) -DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF \ From e4e55540a82f35b94a5c7e01ff636fdd769ba511 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Tue, 29 Jul 2025 12:49:26 -0400 Subject: [PATCH 2/2] if that fix is correct, then these should be also? --- deps/BOLT.mk | 2 +- deps/curl.mk | 8 ++++---- deps/libgit2.mk | 8 ++++---- deps/llvm.mk | 4 ++-- deps/mpfr.mk | 2 +- deps/unwind.mk | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deps/BOLT.mk b/deps/BOLT.mk index 34391ab10f716..43337741489c8 100644 --- a/deps/BOLT.mk +++ b/deps/BOLT.mk @@ -68,7 +68,7 @@ LLVM_CMAKE += -DCMAKE_EXE_LINKER_FLAGS="$(LLVM_LDFLAGS)" \ -DCMAKE_SHARED_LINKER_FLAGS="$(LLVM_LDFLAGS)" ifeq ($(USE_SYSTEM_ZLIB), 0) -$(BOLT_BUILDDIR)/build-configured: | $(build_prefix)/manifest/zlib +$(BOLT_BUILDDIR)/build-configured: | install-zlib endif $(BOLT_BUILDDIR)/build-configured: $(SRCCACHE)/$(BOLT_SRC_DIR)/source-extracted diff --git a/deps/curl.mk b/deps/curl.mk index 5de8c1f766072..1f45271194316 100644 --- a/deps/curl.mk +++ b/deps/curl.mk @@ -2,19 +2,19 @@ include $(SRCDIR)/curl.version ifeq ($(USE_SYSTEM_OPENSSL), 0) -$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/openssl +$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | install-openssl endif ifeq ($(USE_SYSTEM_LIBSSH2), 0) -$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/libssh2 +$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | install-libssh2 endif ifeq ($(USE_SYSTEM_ZLIB), 0) -$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/zlib +$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | install-zlib endif ifeq ($(USE_SYSTEM_NGHTTP2), 0) -$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/nghttp2 +$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | install-nghttp2 endif ifneq ($(USE_BINARYBUILDER_CURL),1) diff --git a/deps/libgit2.mk b/deps/libgit2.mk index 85bc0629f6f28..b39cbd8766cbb 100644 --- a/deps/libgit2.mk +++ b/deps/libgit2.mk @@ -7,19 +7,19 @@ $(eval $(call git-external,libgit2,LIBGIT2,CMakeLists.txt,,$(SRCCACHE))) $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted: export MSYS=$(MSYS_NONEXISTENT_SYMLINK_TARGET_FIX) ifeq ($(USE_SYSTEM_LIBSSH2), 0) -$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/libssh2 +$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | install-libssh2 endif ifeq ($(USE_SYSTEM_OPENSSL), 0) -$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/openssl +$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | install-openssl endif ifeq ($(USE_SYSTEM_PCRE), 0) -$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/pcre +$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | install-pcre endif ifeq ($(USE_SYSTEM_ZLIB), 0) -$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/zlib +$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | install-zlib endif LIBGIT2_OPTS := $(CMAKE_COMMON) -DCMAKE_BUILD_TYPE=Release -DUSE_THREADS=ON -DUSE_BUNDLED_ZLIB=OFF -DUSE_SSH=ON -DREGEX_BACKEND=pcre2 -DBUILD_CLI=OFF -DBUILD_TESTS=OFF diff --git a/deps/llvm.mk b/deps/llvm.mk index e3303aba55afd..f6c323c1eb5e2 100644 --- a/deps/llvm.mk +++ b/deps/llvm.mk @@ -256,11 +256,11 @@ $(eval $(call LLVM_PATCH,llvm-ittapi-cmake)) endif ifeq ($(USE_SYSTEM_ZLIB), 0) -$(LLVM_BUILDDIR_withtype)/build-configured: | $(build_prefix)/manifest/zlib +$(LLVM_BUILDDIR_withtype)/build-configured: | install-zlib endif ifeq ($(USE_SYSTEM_ZSTD), 0) -$(LLVM_BUILDDIR_withtype)/build-configured: | $(build_prefix)/manifest/zstd +$(LLVM_BUILDDIR_withtype)/build-configured: | install-zstd endif diff --git a/deps/mpfr.mk b/deps/mpfr.mk index 5a0605ba6b601..983314d1e5562 100644 --- a/deps/mpfr.mk +++ b/deps/mpfr.mk @@ -2,7 +2,7 @@ include $(SRCDIR)/mpfr.version ifeq ($(USE_SYSTEM_GMP), 0) -$(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured: | $(build_prefix)/manifest/gmp +$(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured: | install-gmp endif ifneq ($(USE_BINARYBUILDER_MPFR),1) diff --git a/deps/unwind.mk b/deps/unwind.mk index 12c5cba543da4..c742c4d6b8775 100644 --- a/deps/unwind.mk +++ b/deps/unwind.mk @@ -8,11 +8,11 @@ LIBUNWIND_CPPFLAGS := -I$(build_includedir) LIBUNWIND_LDFLAGS := -L$(build_shlibdir) ifeq ($(USE_SYSTEM_ZLIB),0) -$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured: | $(build_prefix)/manifest/zlib +$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured: | install-zlib endif ifeq ($(USE_SYSTEM_LLVM),0) -$(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-configured: | $(build_prefix)/manifest/llvm +$(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-configured: | install-llvm endif $(SRCCACHE)/libunwind-$(UNWIND_VER).tar.gz: | $(SRCCACHE)