Make 0ad build with musl libc.
Details
- Reviewers
- None
Compiles on Alpine linux.
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Lint
Lint Skipped - Unit
Unit Tests Skipped
Event Timeline
source/third_party/cppformat/format.cpp | ||
---|---|---|
435 | You can remove the && !defined(__BIONIC__) here, it’s either glibc or bionic, never both. |
libraries/source/nvtt/src/src/nvmath/nvmath.h | ||
---|---|---|
133 | I do not get it, sorry. |
libraries/source/nvtt/src/src/nvmath/nvmath.h | ||
---|---|---|
133 | What that means if we have another patch that fixes it :) |
libraries/source/nvtt/src/src/nvmath/nvmath.h | ||
---|---|---|
133 | I mean the patch https://code.wildfiregames.com/D2475 updates NVTT library. So maybe it's not needed to update the file yet (and do it after update). Also why not isnanf on Linux? It seems the most suitable function for the const float type. |
libraries/source/nvtt/src/src/nvmath/nvmath.h | ||
---|---|---|
133 | isnan(), isnanf() and isnanfl() are obsolete since C99 introduced the isnan() macro which depends on the type of its input. |
libraries/source/nvtt/src/src/nvmath/nvmath.h | ||
---|---|---|
133 | I have seen the linked patch, but I have not seen any change in it related the isnanf issue. nvtt git HEAD still uses isnanf() on linux, so upgrading nvtt will not be enough IMO. |
Like Vlad said, I have just uploaded a NVTT upgrade, so it would be better if you'd test the branch (and I would happily include your patch in my upgrade if it's still needed).
It is available at https://github.com/na-Itms/0ad/tree/nvtt. Please let me know if you have trouble and thanks for your interest!
@voroskoi Maybe you should send a pull request upstream. There is already this PR by a friend but it looks like the NVTT maintainer doesn't want it, maybe they'd rather like your solution.
libraries/source/nvtt/src/src/nvmath/nvmath.h | ||
---|---|---|
133 | Whoops we commented at the same time. I will include this patch in the NVTT upgrade then. |
I have tried your nvtt branch, it fails:
"nvmath.h:193:16: error: 'isnanf' was not declared in this scope; did you mean 'isNan'?"
Anyway, You are right, I will try to get it upstream. Thanks for the heads up!
@Stan: Yes, it does, but I had to add this patch too from pull-request linked above: https://github.com/castano/nvidia-texture-tools/pull/294/commits/34c85d642d1478c7ad008eb3af66eca0a19bc202
Thanks for your patch, I have included the first part (with the other one you needed) in our upgraded NVTT.
For cppformat, we must upgrade that library (see #3190 and #4148). Your patch doesn't apply there so I'm going to reference this diff in the ticket and I hope to perform that upgrade soon. Is it OK with you if I abandon this diff, since we are not going to include it as-is?
Thanks again for the work.
While I appreciate the work on the software, calling leper your friend is a punch in the face and I will not go down in history as someone who read it and left it uncommented.
I genuinely apologize. I used friend because I wanted to express that we were competitors without hard feelings, so I tried to use a friendlier term, which was apparently interpreted as sarcasm. My hate of sarcasm is at the heart of the issue so I am really sorry for my poor choice of terms.
I think "competitor" is too harsh, "former friend/colleague" too sad, so I'll just use "leper" next time and stop worrying about double meanings. Sorry again.