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

Import <algorithm> to build on GCC 14 #129

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Import <algorithm> to build on GCC 14 #129

merged 2 commits into from
Nov 22, 2023

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 •
edited
Loading

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
14 checks passed
@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
dev-util/android-tools: Add patch to fix compilation on GCC 14
61d7559 
<algorithm> is no longer included by default in GCC 14 so explicitly
including it is now required.

Upstream: nmeum/android-tools#129
AOSP CR: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2838578
AOSP CR: https://android-review.googlesource.com/c/platform/system/core/+/2839495

Both CRs to AOSP have been merged and upstream has merged the PR as
well, all that is needed is a version bump from AOSP.

Closes: https://bugs.gentoo.org/916788
Signed-off-by: Christopher Fore <[email protected]>
csfore added a commit to csfore/gentoo that referenced this pull request Dec 9, 2023
@csfore
dev-util/android-tools: Add patch to fix compilation on GCC 14
805c7e3 
<algorithm> is no longer included by default in GCC 14 so explicitly
including it is now required.

Upstream: nmeum/android-tools#129
AOSP CR: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2838578
AOSP CR: https://android-review.googlesource.com/c/platform/system/core/+/2839495

Both CRs to AOSP have been merged and upstream has merged the PR as
well, all that is needed is a version bump from AOSP.

Closes: https://bugs.gentoo.org/916788
Signed-off-by: Christopher Fore <[email protected]>
@csfore csfore mentioned this pull request Dec 9, 2023
Closed
gentoo-bot pushed a commit to gentoo/gentoo that referenced this pull request Dec 9, 2023
@csfore @zmedico
dev-util/android-tools: Add patch to fix compilation on GCC 14
ea1752b 
<algorithm> is no longer included by default in GCC 14 so explicitly
including it is now required.

Upstream: nmeum/android-tools#129
AOSP CR: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2838578
AOSP CR: https://android-review.googlesource.com/c/platform/system/core/+/2839495

Both CRs to AOSP have been merged and upstream has merged the PR as
well, all that is needed is a version bump from AOSP.

Closes: https://bugs.gentoo.org/916788
Signed-off-by: Christopher Fore <[email protected]>
Closes: #34201
Signed-off-by: Zac Medico <[email protected]>
@Biswa96
Copy link
Collaborator

Biswa96 commented Jan 8, 2024 •
edited
Loading

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
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@csfore @anatol @Biswa96 @doronbehar