Curl build improvements #18153
Merged
Curl build improvements #18153
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tkelman
added
domain:building
| @@ -56,8 +52,10 @@ endif | |||
| echo 1 > $@ | |||
|
|
|||
| $(MBEDTLS_OBJ_TARGET): $(MBEDTLS_OBJ_SOURCE) | $(build_shlibdir) | |||
| ifeq ($(OS), WINNT) | |||
| ifeq ($(BUILD_OS), WINNT) | |||
There was a problem hiding this comment.
this line diff is wrong. the install target should never depend on BUILD_OS
There was a problem hiding this comment.
staged install doesn't work properly on msys2
There was a problem hiding this comment.
I'll put it back for now though since it's putting .dll.a files in the wrong place otherwise, need to fix that upstream. I plan on moving appveyor over to a cygwin-cross and dropping official support for MSYS2 in the future since it's not actively maintained and is the cause of too many of these special cases.
in CMAKE_COMMON, so libssh2 installs without an x86_64-linux-gnu multiarch prefix
since we don't need it Go back to just copying the mbedtls dll even in cygwin-cross, otherwise it puts .dll.a files that we don't need alongside the dlls (should probably fix this upstream)
since otherwise it puts pkg-config files in LIB_INSTALL_DIR which we don't need - if mbedtls separates runtime from library destinations then we could separate BIN_INSTALL_DIR from LIB_INSTALL_DIR or convince libgit2 to use the standard GNUInstallDirs names
tkelman
added a commit
that referenced
this pull request
Aug 20, 2016
probably addresses #18106 (cherry picked from commit fb0e106) ref #18153 Delete some files from libssh2 and curl that keep changing on travis causing the cache to get re-uploaded (cherry picked from commit 71bb974) Install all 3 mbedtls dlls on windows and build tests (cherry picked from commit 6b50d35) disable libpsl in curl build should fix clean build of master indent line continuations (cherry picked from commit d14f169) disable using zlib in mbedtls, libssh2, and libcurl since it requires additional dev headers fix #18101 (cherry picked from commit f714e83) Cleanup: replace misleading STAGE#_DEPS variables with DEP_LIBS (cherry picked from commit 0d634a3) Improve handling of curl, mbedtls, libssh2 USE_SYSTEM fix #17884 (cherry picked from commit 4526b65) Set CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_BINDIR in CMAKE_COMMON, so libssh2 installs without an x86_64-linux-gnu multiarch prefix (cherry picked from commit bf60b56) Disable building static mbedtls library since we don't need it Go back to just copying the mbedtls dll even in cygwin-cross, otherwise it puts .dll.a files that we don't need alongside the dlls (should probably fix this upstream) (cherry picked from commit 658dc24) Also just copy libgit2 dll for its install target since otherwise it puts pkg-config files in LIB_INSTALL_DIR which we don't need - if mbedtls separates runtime from library destinations then we could separate BIN_INSTALL_DIR from LIB_INSTALL_DIR or convince libgit2 to use the standard GNUInstallDirs names (cherry picked from commit 8e3f1c5)
|
A todo for myself, can wait until a separate PR though - libgit2's finding of curl via pkg-config should be adjusted with a patch to either fail loudly if pkg-config isn't found and the library would otherwise be built without proxy support, or avoid using pkg-config to find libcurl. |
|
merging so nanosoldier works on tonight's daily build |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Should fix the from-scratch build of master which was broken by #18103