Skip to content

Import <algorithm> to build on GCC 14#129

Merged
anatol merged 2 commits intonmeum:masterfrom
csfore:add-algorithm
Nov 22, 2023
Merged

Import <algorithm> to build on GCC 14#129
anatol merged 2 commits intonmeum:masterfrom
csfore:add-algorithm

Conversation

@csfore
Copy link
Contributor

@csfore csfore commented Nov 22, 2023

By default GCC 14 no longer includes , so it has to be explicitly imported now.

@anatol
Copy link
Collaborator

anatol commented Nov 22, 2023

LGTM.

@csfore could you please also send these changes to upstream Android team?

@anatol
Copy link
Collaborator

anatol commented Nov 22, 2023

Also, do you have a link to a compilation report done with GCC 14 (some CI maybe) that shows the failure?

@csfore
Copy link
Contributor Author

csfore commented Nov 22, 2023

I sent the patches up a couple of couple of days ago 🙂

https://android-review.googlesource.com/c/platform/system/core/+/2839495
https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2838578

And for the build error, would attaching the output of make suffice for each?

@csfore
Copy link
Contributor Author

csfore commented Nov 22, 2023

Here are the build logs for each of them

core-output.log
adb-output.log

@anatol anatol merged commit 399d5f3 into nmeum:master Nov 22, 2023
@anatol
Copy link
Collaborator

anatol commented Nov 22, 2023

Thank you for your work @csfore

@csfore
Copy link
Contributor Author

csfore commented Nov 22, 2023

Thank you! Hopefully it's merged upstream soon enough

@csfore
Copy link
Contributor Author

csfore commented Dec 1, 2023

@anatol Hello! Those two patches I sent upstream were merged finally (first one was a couple of days ago but wanted to wait for both before I reached out), I'm not entirely sure how you update the project but just wanted to let you know!

@anatol
Copy link
Collaborator

anatol commented Dec 1, 2023

Thank you for handling the upstreaming process!

First upstream needs to make a new release with these patches. Then android-tools bumps to that release. At this point the patches will no longer needed in the android-tools repo and can be dropped.

csfore added a commit to csfore/gentoo that referenced this pull request Dec 9, 2023
csfore added a commit to csfore/gentoo that referenced this pull request Dec 9, 2023
gentoo-bot pushed a commit to gentoo/gentoo that referenced this pull request Dec 9, 2023
@Biswa96
Copy link
Collaborator

Biswa96 commented Jan 8, 2024

First upstream needs to make a new release with these patches.

Would it be possible to request a new tag in upstream aosp? platform tools version 34.0.5 was released in October 20231.

Footnotes

  1. https://developer.android.com/tools/releases/platform-tools

@doronbehar
Copy link

I too need this update please 🙏.

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.

4 participants