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.

Sign up for GitHub

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

Jump to bottom

backport: 2018.10 compile fixes #10759

Merged
merged 3 commits into from
Jan 14, 2019
Merged

backport: 2018.10 compile fixes #10759

merged 3 commits into from
Jan 14, 2019

Conversation

kaspar030
Copy link
Contributor

@kaspar030 kaspar030 commented Jan 12, 2019 •
edited by miri64
Loading

Contribution description

Backport of some compile fixes from master.

Testing procedure

Compilation by CI should be sufficient.

Issues/PRs references

Needed to make #10757 pass CI.

@kaspar030 kaspar030 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master labels Jan 12, 2019
@kaspar030 kaspar030 requested a review from miri64 January 12, 2019 16:43
@miri64 miri64 mentioned this pull request Jan 12, 2019
Closed
@miri64 miri64 added Area: build system Area: Build system Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Jan 12, 2019
@miri64
Copy link
Member

miri64 commented Jan 12, 2019

Can you please reference the original commits somewhere?

miri64
miri64 requested changes Jan 12, 2019
View reviewed changes
Copy link
Member

@miri64 miri64 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

See e.g. commit message in my backport PR:

1431a27

@kaspar030 kaspar030 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jan 12, 2019
cladmi and others added 3 commits January 14, 2019 10:28
@cladmi @kaspar030
pkg/tinycrypt: update commit hash after upstream rewrote history
33c3660 
Upstream rewrote history in master which changed our reference commit from

    intel/tinycrypt@3ea1a60

to

    intel/tinycrypt@6a22712

Diff can be verified to be empty with:

    intel/tinycrypt@6a22712...3ea1a60

(cherry-picked from a07ac29)
@smlng @kaspar030
pkg/nimble: disable -Waddress-of-packed-member for llvm
0405afe 
(cherry-picked from 47a6626)
@smlng @kaspar030
pkg/jerryscript: disable -Wconversion for llvm
d663f4d 
(cherry-picked from f56d8d1)
@kaspar030
Copy link
Contributor Author

Can you please reference the original commits somewhere?

Done. Only after I learned about "git cherry-pick -x" ...

@miri64
Copy link
Member

miri64 commented Jan 14, 2019

Unrelated problem: I think Travis tries to rebase to master. We should fix that.

miri64
miri64 approved these changes Jan 14, 2019
View reviewed changes
Copy link
Member

@miri64 miri64 left a comment

Choose a reason for hiding this comment

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

ACK

@miri64 miri64 mentioned this pull request Jan 14, 2019
Merged
@miri64 miri64 merged commit 2d16226 into RIOT-OS:2018.10-branch Jan 14, 2019
@miri64 miri64 mentioned this pull request Jan 14, 2019
Merged
@kaspar030 kaspar030 deleted the 2018.10-compile-fixes branch January 14, 2019 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miri64 miri64 miri64 approved these changes

Assignees
No one assigned
Labels
Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kaspar030 @miri64 @cladmi @smlng