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

Backport 16016 - Remove linkname references - allowing native compiling on go1.23 #123

Closed
wants to merge 2 commits into from

Conversation

andyedison
Copy link

@andyedison andyedison commented Sep 24, 2024

Description

This PR applies backport vitessio#16016 to our v17 branch. The upstream PR and subsequent changes affected some files that didn't exist in our v17 branch. For all but one we left them removed. The one leftover was because in v17 vitess moved to a different cache implementation. This means the references to the hack package functions that were removed were remaining in our v17 branch because we still have the old cache implementation. I made the adjustments myself, and contained them within a commit, 64682769249224fb2aacf8a342d9458bc8dc2f17.

cc https://github.com/github/vitess/issues/1207

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Documentation was added or is not required

Deployment Notes

@andyedison
Copy link
Author

╰─ git cherry-pick b49494e5b4c821ef79e08e86bb18e9c3e6bbdb43
CONFLICT (modify/delete): go/cache/theine/store.go deleted in HEAD and modified in b49494e5b4 (Linkname removal (step 1) (#16016)).  Version b49494e5b4 (Linkname removal (step 1) (#16016)) of go/cache/theine/store.go left in tree.
Auto-merging go/hack/hack.go
CONFLICT (modify/delete): go/hack/runtime.go deleted in b49494e5b4 (Linkname removal (step 1) (#16016)) and modified in HEAD.  Version HEAD of go/hack/runtime.go left in tree.
Auto-merging go/mysql/fastparse/fastparse.go
CONFLICT (content): Merge conflict in go/mysql/fastparse/fastparse.go
Auto-merging go/mysql/fastparse/fastparse_test.go
CONFLICT (modify/delete): go/vt/vtgate/evalengine/weights.go deleted in HEAD and modified in b49494e5b4 (Linkname removal (step 1) (#16016)).  Version b49494e5b4 (Linkname removal (step 1) (#16016)) of go/vt/vtgate/evalengine/weights.go left in tree.
error: could not apply b49494e5b4... Linkname removal (step 1) (#16016)

Documenting the cherry-pick output here

@andyedison andyedison closed this Oct 16, 2024
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.

2 participants