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.

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

Update boost and python-cmake #49

Merged
merged 7 commits into from
Jun 30, 2019

Conversation

o01eg
Copy link
Contributor

@o01eg o01eg commented May 12, 2019

Extracted from #48.

Updates boost to 1.69, next version update is in #50.

Should be usable even with python2 only support.

o01eg added 4 commits May 12, 2019 17:55
Remove already applied patches/boost/0001-7970.patch
Remove incorrect hunk from patches/boost/0003-7920.patch
@o01eg
Copy link
Contributor Author

o01eg commented May 18, 2019

@adrianbroher I've updated boost to 1.68 and changed some gil patches, could you review it?

@o01eg
Copy link
Contributor Author

o01eg commented May 18, 2019

It looks like boost >= 1.67 requires to add bcrypt.lib on windows boostorg/uuid#68

@o01eg o01eg mentioned this pull request May 18, 2019
@o01eg
Copy link
Contributor Author

o01eg commented May 18, 2019

Next thing I catch is boostorg/python#212

@o01eg o01eg force-pushed the update-boost-python branch 2 times, most recently from bafb312 to 9e41cbb Compare May 19, 2019 06:30
@o01eg o01eg force-pushed the update-boost-python branch from 9e41cbb to c264752 Compare May 19, 2019 10:42
@o01eg
Copy link
Contributor Author

o01eg commented May 25, 2019

There is a bug in python's pyerror.h redefines snprinf after upgrading boost to 1.69

https://bugs.python.org/issue36020
nlohmann/json#1408

@o01eg
Copy link
Contributor Author

o01eg commented May 25, 2019

I've fixed pyerror.h in generated SDK and freeorion builds and runs, but I suppose patches to python should be applied with python-cmake.

@o01eg
Copy link
Contributor Author

o01eg commented May 25, 2019

I've prepared patch for python-cmake but it failed for apply on python with windows EOL. If I converts it to unix EOL it failed to apply on python-cmake.

@o01eg o01eg changed the title Update boost and python-cmake [WIP] Update boost and python-cmake May 25, 2019
@o01eg o01eg force-pushed the update-boost-python branch 2 times, most recently from c21a3cd to b184856 Compare May 30, 2019 21:00
@o01eg o01eg force-pushed the update-boost-python branch from 439952f to 4329105 Compare June 7, 2019 20:00
@o01eg
Copy link
Contributor Author

o01eg commented Jun 8, 2019

I've updated boost to 1.70 but found errors about missing gil files boost/gil/gil_config.hpp and boost/gil/extension/io/io_error.hpp. Could someone help with it?

@o01eg o01eg force-pushed the update-boost-python branch from 4329105 to e678ec3 Compare June 30, 2019 08:16
@o01eg o01eg mentioned this pull request Jun 30, 2019
@o01eg o01eg changed the title [WIP] Update boost and python-cmake Update boost and python-cmake Jun 30, 2019
@o01eg
Copy link
Contributor Author

o01eg commented Jun 30, 2019

I've split out boost 1.69 to 1.70 so it possible to merge this PR now.

@geoffthemedio
Copy link
Member

I've split out boost 1.69 to 1.70 so it possible to merge this PR now.

But pull request 50 is listed as superseding this. Which should be merged?

@o01eg
Copy link
Contributor Author

o01eg commented Jun 30, 2019

But pull request 50 is listed as superseding this. Which should be merged?

#50 still has unsolved issues so only this PR could be merged.

@geoffthemedio geoffthemedio merged commit 81c033f into freeorion:master Jun 30, 2019
@o01eg o01eg deleted the update-boost-python branch June 30, 2019 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants