SuperTuxKart: Replaced some bundled libraries with system ones #91421
Conversation
SCOTT-HAMILTON
force-pushed
the
SuperTuxKart
branch
from
483ab02
to
e9e8d0a
Compare
|
Needs #91425, waiting for this PR to be merged. |
| include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src") | ||
|
|
||
| # Find system ENet library or build it if missing | ||
| -if((UNIX AND NOT APPLE) AND USE_SYSTEM_ENET AND NOT USE_IPV6) |
There was a problem hiding this comment.
why removing the check about USE_IPV6 ?
There was a problem hiding this comment.
libenet doesn't yet support ipv6 upstream lsalzman/enet#109.
So I either disable ipv6 or I use the bundled libenet (which has been fixed to support ipv6).
There was a problem hiding this comment.
ok but instead of patching, you could probably pass USE_IPV6=no https://notabug.org/Supertuxkart/stk-code/src/master/CMakeLists.txt#L32 ? also maybe we could keep using the bundled enet until the next release with ipv6 support otherwise the update removes feature.
There was a problem hiding this comment.
In terms of closuze size it's getting worse :
890.0M before against 898.2M now.
I don't really explain this. It doesn't seem to be static linking since all
libs are dynamically linked.
There was a problem hiding this comment.
maybe the system packages have a bigger closure because they are built with more options/stuff ?
There was a problem hiding this comment.
the difference is little and if one of the lib is reused, it becomes a gain (again :) ) so not an issue for me.
There was a problem hiding this comment.
Since the bundled libs are statically linked, this frees 2M on the final executable :
17M→15M
SCOTT-HAMILTON
force-pushed
the
SuperTuxKart
branch
from
e9e8d0a
to
5477325
Compare
|
New rebasing : added WiiUse, removed CMakeLists.txt patch and added libenet to whitelist of bundled libs to keep. |
SCOTT-HAMILTON
force-pushed
the
SuperTuxKart
branch
from
5477325
to
8ab9b84
Compare
| cmakeFlags = [ | ||
| "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs | ||
| "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 | ||
| "-DCHECK_ASSETS=OFF" | ||
| "-DUSE_SYSTEM_ENET=ON" |
There was a problem hiding this comment.
if we whitelist enet, then we don't use the system one
SCOTT-HAMILTON
force-pushed
the
SuperTuxKart
branch
from
8ab9b84
to
b2b28fc
Compare
|
ran nixpkgs-review and... endud up to complete 2 laps with tux. thanks |
Motivation for this change
Was packaging WiiUse when noticed
that SuperTuxKart was conflicting with it. So I came with
this partially unbundled build. This should also reduce the package size a bit.
Things done
Replaced some bundled libs with system ones.
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)