edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't bundle libcurl for Linux

Browse source 
It's installed basically everywhere and just increases release size.
They're serious about backward compatibility and haven't had a breaking
change in ages.
This commit is contained in:
heinrich5991 2019-09-30 09:53:24 +02:00
parent ef32fc4bed
commit 3de73cf96a
2 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmake/FindCurl.cmake
View file

@ -26,25 +26,6 @@ if(CURL_FOUND)
is_bundled(CURL_BUNDLED "${CURL_LIBRARY}") is_bundled(CURL_BUNDLED "${CURL_LIBRARY}")
set(CURL_LIBRARIES ${CURL_LIBRARY}) set(CURL_LIBRARIES ${CURL_LIBRARY})
set(CURL_INCLUDE_DIRS ${CURL_INCLUDEDIR}) set(CURL_INCLUDE_DIRS ${CURL_INCLUDEDIR})
if(CURL_BUNDLED AND TARGET_OS STREQUAL "linux")
find_library(CURL_LIBRARY_SSL
NAMES ssl
HINTS ${EXTRA_CURL_LIBDIR}
)
find_library(CURL_LIBRARY_CRYPTO
NAMES crypto
HINTS ${EXTRA_CURL_LIBDIR}
)
# If we don't add `dl`, we get a missing reference to `dlclose`:
# ```
# /usr/bin/ld: ../ddnet-libs/curl/linux/lib64/libcrypto.a(dso_dlfcn.o): undefined reference to symbol 'dlclose@@GLIBC_2.2.5'
# ```
#
# Order matters, SSL needs to be linked before CRYPTO, otherwise we also get
# undefined symbols.
list(APPEND CURL_LIBRARIES ${CURL_LIBRARY_SSL} ${CURL_LIBRARY_CRYPTO} dl)
endif()
if(CURL_BUNDLED AND TARGET_OS STREQUAL "windows") if(CURL_BUNDLED AND TARGET_OS STREQUAL "windows")
set(CURL_COPY_FILES set(CURL_COPY_FILES
"${EXTRA_CURL_LIBDIR}/libcurl.dll" "${EXTRA_CURL_LIBDIR}/libcurl.dll"

2
ddnet-libs

@ -1 +1 @@
Subproject commit 5ea046d7e709e56bb4bbfef69681cb1b57e304e0 Subproject commit 88acfd44263b6e6c1fcfa1d8e67c224481c2297d