Makefile: make PROJ compile on Publish Bleeding Edge#49917
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Jun 8, 2020
Merged
Makefile: make PROJ compile on Publish Bleeding Edge#49917craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Member
|
This change is |
Contributor
Author
e01eccc to
b8be21a
Compare
As docgen relies on builtins which relies on proj, we are stuck in a situation in cross compilation where we are trying to install docgen with a non-native libproj.a file causing the linker to fail in `Upload Binaries`. Fix this by not compiling docgen on cross compilations. Also fix the windows compilation as PROJ will dump it into a libproj_4_9.a instead of libproj.a. Cannot see an option to fix this on the CMakeLists.txt. Also make execgen not depend on LIBPROJ. Release note: None
petermattis
approved these changes
Jun 8, 2020
Collaborator
petermattis
left a comment
There was a problem hiding this comment.
Did execgen never really require LIBPROJ? I'm not seeing what changed that allowed that.
Reviewable status:
complete! 1 of 0 LGTMs obtained (waiting on @petermattis)
Contributor
Author
|
bors r=petermattis
https://github.com/cockroachdb/cockroach/pull/49783/files did 🙈 but i was focusing on docgen, not execgen. woops! |
Contributor
Build succeeded |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As docgen relies on builtins which relies on proj, we are stuck in a
situation in cross compilation where we are trying to install docgen
with a non-native libproj.a file causing the linker to fail in
Upload Binaries. Fix this by not compiling docgen on cross compilations.Also fix the windows compilation as PROJ will dump it into a
libproj_4_9.a instead of libproj.a.
Also make execgen not depend on LIBPROJ since it's not required.
Release note: None