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

SITL fixs for alpine linux #11871

Merged
merged 3 commits into from
Aug 5, 2019
Merged

SITL fixs for alpine linux #11871

merged 3 commits into from
Aug 5, 2019

Conversation

khancyr
Copy link
Contributor

@khancyr khancyr commented Jul 23, 2019

This fix two error when building SITL on Alpine linux, mainly use on docker.
First fix is for feenableexcept that is only present on glibc, as alpine is using musl, I made a workaround with c++11 standard library.

The second fix a missing header.

I will provide the alpine image later. Using alpine allow to shrink docker container with SITL from 68Mo on ubuntu to 10Mo ! That save some trees !

@@ -46,3 +46,29 @@ inline int fedisableexcept(unsigned int excepts)
}

#endif

#if (defined(HAVE_FEENABLEEXCEPT) && !HAVE_FEENABLEEXCEPT) && !defined(__APPLE__)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't this break the build on macos as functions won't be defined?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless my boolean logic, this won't be define on macos.
But those functions get their own implementation on macos upper on this file

libraries/AP_Common/missing/fenv.h Outdated Show resolved Hide resolved
Tools/ardupilotwaf/cxx_checks.py Outdated Show resolved Hide resolved
Tools/ardupilotwaf/cxx_checks.py Outdated Show resolved Hide resolved
Tools/ardupilotwaf/cxx_checks.py Outdated Show resolved Hide resolved
@khancyr
Copy link
Contributor Author

khancyr commented Jul 31, 2019

@OXINARF changes done !

@OXINARF OXINARF requested a review from tridge July 31, 2019 12:33
@OXINARF
Copy link
Member

OXINARF commented Jul 31, 2019

@tridge Any objection on merging?

@tridge tridge merged commit 1a71519 into ArduPilot:master Aug 5, 2019
@khancyr khancyr deleted the alpine branch August 6, 2019 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants