[cmake] Update static dependencies to fix build issues #272
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
This means we no longer need to use the trunk version for mac, since the new releases have the desired patches for: https://bz.apache.org/bugzilla/show_bug.cgi?id=64753 Also means we no longer need pcre1, since now apache can use pcre2. Apache 2.4.55, apr 1.7.2, and aprutil 1.6.3.
OpenSSL 1.1.1t, pcre2 10.42, SQLite 3.40.1, and MbedTLS 2.28.2
This allows mariadbconnector to reuse the static zlib build created for zlib.ndll, or to use the system version otherwise on unix systems.
Remove obsolete patches Avoid patch error with semicolons https://stackoverflow.com/questions/72098319/cmake-string-replace-removes-semi-colon
Should ensure static linking on all platforms if STATIC_OPENSSL is set.
These flags are not enough to build aprutil with openssl support, so they have had no effect even for aprutil 1.5.4.
This gives access to FindSQLite3.
We now have to download and build the expat library separately, as it is no longer bundled with aprutil. This requires patching the aprutil cmakelists file, as cmake's findexpat script is currently quite limited. See: https://gitlab.kitware.com/cmake/cmake/-/issues/24422 It also requires setting the CMP0074 policy (available from cmake 3.12) when building aprutil, so that EXPAT_ROOT is not ignored.
We can use this now with cmake 3.12+
If Apache was set in STATIC_DEPS, but not APR or APRutil, this would cause a build error previously.
project() call should come first
tobil4sk
force-pushed
the
dependency-updates
branch
from
13164e6
to
101c498
Compare
If we are not doing a static build, then there is no reason to know anything about the openssl library. That will be handled by the mariadbconnector build scripts.
andyli
reviewed
Feb 20, 2023
|
Got to green in the end. This fixes the build issues from #216 by updating mariadbconnector, and also updates the remaining dependencies. PCRE1 is now completely gone, since new versions of Apache can use PCRE2 instead. I left out BoehmGC since that is handled in: #264 It may be a good idea to merge #224 and #243 first to avoid merge conflict issues. |
tobil4sk
changed the title
tobil4sk
force-pushed
the
dependency-updates
branch
from
7d920f8
to
02f7a49
Compare
Simn
reviewed
Mar 27, 2023
|
#220 will cause some conflicts too, so that should be merged before this as well. |
When building APRutil, we rely on EXPAT_ROOT for finding expat, which is only available with CMP0074 on CMake 3.12+. This means building APRutil on Windows will fail if CMake is older than 3.12.
This policy is from CMake 3.9, so it gets set automatically with: cmake_minimum_required(VERSION 3.10.2)
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.
Updates various dependencies, including mariadbconnector which fixes #216.
Using httpd version 2.4.55: httpd-2.4.55.tar.gz