Skip to content

source build: fix openssl race in installing libssh2 #59141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

source build: fix openssl race in installing libssh2 #59141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
113e378
source build: fix openssl race in installing libssh2
IanButterworth Jul 29, 2025
e4e5554
if that fix is correct, then these should be also?
IanButterworth Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/BOLT.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions deps/curl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions deps/libgit2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps/libssh2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions deps/llvm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion deps/mpfr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions deps/unwind.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down