Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zeroad: fix build #109177

Closed
wants to merge 2 commits into from
Closed

zeroad: fix build #109177

wants to merge 2 commits into from

Conversation

mweinelt
Copy link
Member

Fails to build with GCC10, hence the downgrade.

Linking Collada
/nix/store/c1gipyfc161lm0fqfg65k4ak7yl2i17i-binutils-2.34/bin/ld: ../../../libraries/source/fcollada/lib/libFColladaSR.a(FAXInstanceExport.o): in function `FArchiveXML::WritePhysicsRigidBodyInstance(FCDObject*, _xmlNode*)':
FAXInstanceExport.cpp:(.text+0xc69): undefined reference to `_xmlNode* FArchiveXML::AddPhysicsParameter<FMVector3, 0>(_xmlNode*, char const*, FCDParameterAnimatableT<FMVector3, 0>&)'
/nix/store/c1gipyfc161lm0fqfg65k4ak7yl2i17i-binutils-2.34/bin/ld: FAXInstanceExport.cpp:(.text+0xc7f): undefined reference to `_xmlNode* FArchiveXML::AddPhysicsParameter<FMVector3, 0>(_xmlNode*, char const*, FCDParameterAnimatableT<FMVector3, 0>&)'
collect2: error: ld returned 1 exit status
make[1]: *** [Collada.make:98: ../../../binaries/system/libCollada.so] Error 1
make: *** [Makefile:173: Collada] Error 2
builder for '/nix/store/dj7i8mm4kjnbizni4hlgh3394979gc6s-0ad-0.0.23b.drv' failed with exit code 2

Also applies the patch from @zeri42 in #100256 (comment)

Motivation for this change

Closes: #100256

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ajs124
Copy link
Member

ajs124 commented Jan 12, 2021

See also #108761, although this looks more concise.

@mweinelt
Copy link
Member Author

mweinelt commented Jan 12, 2021 •
edited

I'm also still looking into an issue on the Ryzen platform, that upstream fixed just yesterday.

https://code.wildfiregames.com/D3165

mweinelt
mweinelt commented Jan 12, 2021
View reviewed changes
pkgs/games/0ad/game.nix Outdated Show resolved Hide resolved
@mweinelt
zeroad: fix build
4cd7fdc 
Migrates to GCC9 to work around linker issues in Collada.

```
/nix/store/c1gipyfc161lm0fqfg65k4ak7yl2i17i-binutils-2.34/bin/ld: ../../../libraries/source/fcollada/lib/libFColladaSR.a(FAXInstanceExport.o): in function `FArchiveXML::WritePhysicsRigidBodyInstance(FCDObject*, _xmlNode*)':
FAXInstanceExport.cpp:(.text+0xc69): undefined reference to `_xmlNode* FArchiveXML::AddPhysicsParameter<FMVector3, 0>(_xmlNode*, char const*, FCDParameterAnimatableT<FMVector3, 0>&)'
/nix/store/c1gipyfc161lm0fqfg65k4ak7yl2i17i-binutils-2.34/bin/ld: FAXInstanceExport.cpp:(.text+0xc7f): undefined reference to `_xmlNode* FArchiveXML::AddPhysicsParameter<FMVector3, 0>(_xmlNode*, char const*, FCDParameterAnimatableT<FMVector3, 0>&)'
```
@mweinelt
zeroad: add workaround for caching issue on ryzen
e679d9c 
https://trac.wildfiregames.com/ticket/4360

Fixes NixOS#100256
@andir
Copy link
Member

andir commented Jan 12, 2021

Is this expected?

Known issues:
 - SpiderMonkey 38 is outdated and contains known security vulnerabilities.

@mweinelt
Copy link
Member Author

Yep, kinda. I didn't test upgrading this.

@mweinelt mweinelt closed this Feb 7, 2021
@mweinelt mweinelt deleted the 0ad branch February 7, 2021 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
2.status: merge conflict 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

zeroad/0ad crashes when starting
4 participants
@mweinelt @ajs124 @andir @SuperSandro2000