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

deps: configure and build patched libedit redux #38400

Merged
merged 2 commits into from
Jun 25, 2019

Conversation

benesch
Copy link
Contributor

@benesch benesch commented Jun 25, 2019

Resubmit #32623 with a patch to avoid building libedit on Windows, where it's unsupported. I've verified that build/builder.sh mkrelease windows succeeds with this additional patch.

Libedit doesn't support Windows, so don't try to build/link it there.
This was the previous behavior, but I broke it in cockroachdb#32623.

Release note: None
@benesch benesch requested review from jordanlewis, danhhz and a team June 25, 2019 14:52
@benesch benesch requested a review from a team as a code owner June 25, 2019 14:52
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@benesch benesch changed the title Libedit no windows deps: configure and build patched libedit redux Jun 25, 2019
Copy link
Member

@jordanlewis jordanlewis left a comment

Choose a reason for hiding this comment

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

:lgtm_strong:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @danhhz and @jordanlewis)

@benesch
Copy link
Contributor Author

benesch commented Jun 25, 2019

Second time's the charm! 😬

bors r=jordanlewis

@benesch
Copy link
Contributor Author

benesch commented Jun 25, 2019

omg Bors I do not miss you one bit

bors r=jordanlewis

craig bot pushed a commit that referenced this pull request Jun 25, 2019
38400: deps: configure and build patched libedit redux r=jordanlewis a=benesch

Resubmit #32623 with a patch to avoid building libedit on Windows, where it's unsupported. I've verified that `build/builder.sh mkrelease windows` succeeds with this additional patch.

Co-authored-by: Nikhil Benesch <nikhil.benesch@gmail.com>
@craig
Copy link
Contributor

craig bot commented Jun 25, 2019

Build succeeded

@craig craig bot merged commit 29378c0 into cockroachdb:master Jun 25, 2019
@benesch benesch deleted the libedit-no-windows branch June 25, 2019 17:48
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.

3 participants