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

arm: remove autoboost headers #612

Merged
merged 3 commits into from
Jul 1, 2015
Merged

arm: remove autoboost headers #612

merged 3 commits into from
Jul 1, 2015

Conversation

Okyara
Copy link

@Okyara Okyara commented Jun 23, 2015

  • Verify this still builds on Android

@jdonald
Copy link
Contributor

jdonald commented Jul 1, 2015

This builds for aarch64 gcc 4.9, but not the 32-bit arm gcc 4.8, as we require boost::future.

If you want to take a step toward our gcc 4.9 r10d NDK upgrade, you could make this code conditional on the gcc version.

@jdonald
Copy link
Contributor

jdonald commented Jul 1, 2015

Talked to Oksana about this in person and now understand the purpose behind it. These were her local changes to build for ARM Linux.

What we really need to do is a simpler change: replace the autowiring_build_ARM condition with something like autowiring_build_ANDROID. That is, continue using autoboost for Android, but not use it for ARM Linux or anything else. Oksana will fix this soon.

codemercenary added a commit that referenced this pull request Jul 1, 2015
@codemercenary codemercenary merged commit 566cb8e into master Jul 1, 2015
@codemercenary codemercenary deleted the arm-remove-autoboost branch July 1, 2015 20:01
@jdonald
Copy link
Contributor

jdonald commented Jul 1, 2015

Oh, we also need the corresponding changes to #cmakedefine01 autowiring_BUILD_ANDROID AutowiringConfig.h.in, and set the new CMake variable around line 15 of CMakeLists.txt

So this merge likely broke Android 32-bit.

codemercenary added a commit that referenced this pull request Jul 5, 2015
@codemercenary
Copy link
Contributor

This pull request was incorrectly targeted at master. I have done the merge again and pushed it to develop instead in commit ddf684a

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.

None yet

3 participants