[gamenetworkingsockets] fix static build #19310
Closed
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 261c458af6e3eed5d099144aff95d2b5035f656b -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/g-/gamenetworkingsockets.json b/versions/g-/gamenetworkingsockets.json
index 3aeda7b..16be0f2 100644
--- a/versions/g-/gamenetworkingsockets.json
+++ b/versions/g-/gamenetworkingsockets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "b5852cde2df253ed27a294c79cce2f10be04dedc",
+ "version-semver": "1.3.0",
+ "port-version": 1
+ },
{
"git-tree": "02453dad9eb5272c445ba8e22c3d1aa3383a1a11",
"version": "1.3.0",
JackBoosY
added
the
category:port-feature
JackBoosY
suggested changes
Aug 3, 2021
Comment on lines
+13
to
+15
| if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||
| set(STATIC_LIB_LINKAGE_OPTS -DBUILD_SHARED_LIBS=OFF -DProtobuf_USE_STATIC_LIBS=ON -DOPENSSL_USE_STATIC_LIBS=ON) | ||
| endif() |
There was a problem hiding this comment.
When the user manually sets the build type of protobuf and openssl, this is invalid.
Comment on lines
+93
to
+113
| -add_library(GameNetworkingSockets SHARED "") | ||
| -add_library(GameNetworkingSockets::GameNetworkingSockets ALIAS GameNetworkingSockets) | ||
| -add_library(GameNetworkingSockets::shared ALIAS GameNetworkingSockets) | ||
| -gamenetworkingsockets_common(GameNetworkingSockets) | ||
| - | ||
| add_library(GameNetworkingSockets_s STATIC "") | ||
| add_library(GameNetworkingSockets::GameNetworkingSockets_s ALIAS GameNetworkingSockets_s) | ||
| add_library(GameNetworkingSockets::static ALIAS GameNetworkingSockets_s) | ||
| target_compile_definitions(GameNetworkingSockets_s INTERFACE STEAMNETWORKINGSOCKETS_STATIC_LINK) | ||
| +set(GAMENETWORKINGSOCKETS_INSTALL_TARGETS GameNetworkingSockets_s) | ||
| gamenetworkingsockets_common(GameNetworkingSockets_s) | ||
|
|
||
| +if(BUILD_SHARED_LIBS) | ||
| + add_library(GameNetworkingSockets SHARED "") | ||
| + add_library(GameNetworkingSockets::GameNetworkingSockets ALIAS GameNetworkingSockets) | ||
| + add_library(GameNetworkingSockets::shared ALIAS GameNetworkingSockets) | ||
| + gamenetworkingsockets_common(GameNetworkingSockets) | ||
| + list(APPEND GAMENETWORKINGSOCKETS_INSTALL_TARGETS GameNetworkingSockets) | ||
| +else() | ||
| + add_library(GameNetworkingSockets::GameNetworkingSockets ALIAS GameNetworkingSockets_s) | ||
| +endif() |
There was a problem hiding this comment.
We should change it to:
if (BUILD_SHARED_LIBS)
add_library(GameNetworkingSockets SHARED "")
...
else()
add_library(GameNetworkingSockets_s STATIC "")
...
endif()
Comment on lines
+11
to
+15
| +if(DEFINED VCPKG_CRT_LINKAGE) | ||
| + set(MSVC_RUNTIME ${VCPKG_CRT_LINKAGE}) | ||
| +else() | ||
| + set(MSVC_RUNTIME "dynamic") | ||
| +endif() |
There was a problem hiding this comment.
Replace these code to:
vcpkg_configure_cmake(
...
OPTIONS
-DMSVC_RUNTIME=${VCPKG_CRT_LINKAGE}
...
)
Comment on lines
+17
to
+19
| +if(MSVC_RUNTIME STREQUAL "static") | ||
| + set(OPENSSL_MSVC_STATIC_RT TRUE) | ||
| +endif() |
There was a problem hiding this comment.
I didn't find OPENSSL_MSVC_STATIC_RT in the upstream, can you double confirm this?
| ) | ||
| endif() | ||
|
|
||
| +option(BUILD_SHARED_LIBS "Build shared library" ON) |
There was a problem hiding this comment.
This option doesn't need to be declared since it's provided by cmake.
| option(LTO "Enable Link-Time Optimization" OFF) | ||
| option(USE_STEAMWEBRTC "Build Google's WebRTC library to get ICE support for P2P" OFF) | ||
| option(Protobuf_USE_STATIC_LIBS "Link with protobuf statically" OFF) | ||
| +option(OPENSSL_USE_STATIC_LIBS "Link with OpenSSL statically" OFF) |
There was a problem hiding this comment.
Suggested change
| +option(OPENSSL_USE_STATIC_LIBS "Link with OpenSSL statically" OFF) |
I didn't find any implementation of this.
|
This PR has been inactive for a long time, please reopen it if there is any progress. |
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.
What does your PR fix?
Fixes building static library with a patch from https://github.com/aiusepsi/GameNetworkingSockets/tree/windows-static until @aiusepsi's changes are applied to upstream
Which triplets are supported/not supported? Have you updated the CI baseline?
Same as before plus windows static triplets and no
Does your PR follow the maintainer guide?
Not confident but I believe so
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?Yes