Skip to content

[deps] Fix build systems of curl and openssl #56960

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

Merged
merged 1 commit into from
Jan 5, 2025
Merged

[deps] Fix build systems of curl and openssl #56960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions deps/curl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## CURL ##
include $(SRCDIR)/curl.version

ifeq ($(USE_SYSTEM_OPENSSL), 0)
$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/openssl
endif

ifeq ($(USE_SYSTEM_LIBSSH2), 0)
$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/libssh2
endif
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ else ifeq ($(ARCH),ppc64le)
OPENSSL_TARGET := linux-ppc64le
else ifeq ($(ARCH),powerpc64le)
OPENSSL_TARGET := linux-ppc64le
else ifeq ($(ARCH),riscv64)
OPENSSL_TARGET := linux64-riscv64
Copy link
Member Author

@giordano giordano Jan 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reference for this target name: https://github.com/openssl/openssl/blob/817a2b2b4955da0233fe7e6e4bd16c0255262b4f/Configurations/10-main.conf#L819. Or run ./Configure --help on a riscv64-linux box.

endif
else
OPENSSL_TARGET := unknown
Expand Down
Loading