Add a $(uname_S) case for Minix with the correct options.
Minix's linker needs all libraries specified explicitly. Add NEEDS_SSL_WITH_CURL to add -lssl when using -lcurl. Add NEEDS_IDN_WITH_CURL to add -lidn when using -lcurl.
When NEEDS_SSL_WITH_CURL is defined and NEEDS_CRYPTO_WITH_SSL is defined, add -lcrypt to CURL_LIBCURL.
Change OPENSSL_LINK to OPENSSL_LIBSSL in the NEEDS_CRYPTO_WITH_SSL conditional in the libopenssl section. Libraries go in OPENSSL_LIBSSL, OPENSSL_LINK is for linker flags.
Signed-off-by: Thomas Cort <tcort@minix3.org> --- Makefile | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-)
Show changes to Makefile +29 −1
diff --git a/Makefile b/Makefile index 4ed7996..62ad0c2 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,10 @@ all:: # # Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin). # +# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix). +# +# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix). +# # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). # # Define NEEDS_SOCKET if linking with libc is not enough (SunOS, @@ -1149,6 +1153,20 @@ ifeq ($(uname_S),Interix) NO_FNMATCH_CASEFOLD = YesPlease endif endif +ifeq ($(uname_S),Minix) + NO_IPV6 = YesPlease + NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease + NO_NSEC = YesPlease + NEEDS_LIBGEN = + NEEDS_CRYPTO_WITH_SSL = YesPlease + NEEDS_IDN_WITH_CURL = YesPlease + NEEDS_SSL_WITH_CURL = YesPlease + NEEDS_RESOLV = + NO_HSTRERROR = YesPlease + NO_MMAP = YesPlease + NO_CURL = + NO_EXPAT = +endif ifneq (,$(findstring MINGW,$(uname_S))) pathsep = ; NO_PREAD = YesPlease @@ -1293,6 +1311,16 @@ else else CURL_LIBCURL = -lcurl endif + ifdef NEEDS_SSL_WITH_CURL + CURL_LIBCURL += -lssl + ifdef NEEDS_CRYPTO_WITH_SSL + CURL_LIBCURL += -lcrypto + endif + endif + ifdef NEEDS_IDN_WITH_CURL + CURL_LIBCURL += -lidn + endif + REMOTE_CURL_PRIMARY = git-remote-http$X REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES) @@ -1329,7 +1357,7 @@ ifndef NO_OPENSSL OPENSSL_LINK = endif ifdef NEEDS_CRYPTO_WITH_SSL - OPENSSL_LINK += -lcrypto + OPENSSL_LIBSSL += -lcrypto endif else BASIC_CFLAGS += -DNO_OPENSSL
-- 1.7.4.1