-
Notifications
You must be signed in to change notification settings - Fork 9
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 vendored S2 version #257
Conversation
* copy some prior art * remove previous absl files * renove abseil files * add vendor in tools/ * it works! * fix some initial check issues * lazier config * remove r 3.6 on windows * see if removing the braces helps * maybe fix substitution * just link it all * try again * helppers * slight updates * better flags * more cmake * just hard code it * pkg-config * add gnu make to makefile * don't link rt * ignore windows dir * possible progress for R 4.2 * more win checks * don't use configure.win * maybe working on R 4.2 * also use cxx17 * check for absl * maybe with quotes * version and news * maybe the right flags * maybe try unifying makevars * maybe work on R 4.2/4/1 * maybe fix makevars.win * maybe fix for R 4.2 * maybe fix R 4.1 * see if we're getting the right if statement * temp fix for old s2 warnings * maybe fix again * try again * document configure.win * maybe fix R 4.2 warning * try again for globals * maybe use different namespace * use pkg-config abseil * fix comment * maybe fix * quality of life improvements * clean news * better cleanup/configure * reasonable path to not awful dev setup without system abseil * enforce minimum version in pkg-config check
a50a2e7
to
41a1e0e
Compare
e9b012c
to
235f92e
Compare
Ok, we're down to some warnings on Windows:
...and a few undefined symbols on Rtools40:
|
Looks like you've visited the warning earlier: https://github.com/r-spatial/s2/blob/main/src/s2/util/coding/coder.h#L465 |
@edzer I think the best way forward on here is to merge this and attempt to fix the missing symbol on R/Windows 4.0 and 4.1 separately (in parallel with some testing against Abseil provided in various distributions to ensure the install works smoothly). |
It turns out that getting CMake to do the right thing is hard (#249)! I think we still need it for Abseil, and unfortunately updating S2 requries an Abseil update too. I'll put this here and do the Abseil update separately 🙂