opencollada: include pcre.h (KhronosGroup/OpenCOLLADA#570) #44126
Conversation
This file contains 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
|
attached patch fails against latest master Looking at it, there seem to be some superflous whitespace changes in the attached patch. Maybe the merge conflict can be resolved, by just adding the PCRE include? Could you link the original ticket(s), for reference? |
eadwu
force-pushed
the
opencollada/resolve-pcre-declarations
branch
from
90bbd16
to
e9198c8
Compare
|
Does the new commit work? I guess I successfully isolated the hunk, though if I try to change the file endings in the hunk, it fails to get patched on mine, which results in the patch having unix line endings for the file but dos line endings in the hunk. (Original Issue: KhronosGroup/OpenCOLLADA#570) |
This comment has been minimized.
This comment has been minimized.
|
@GrahamcOfBorg build opencollada |
|
Failure on x86_64-darwin (full log) Attempted: opencollada Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: opencollada Partial log (click to expand)
|
|
Does the build on darwin build without this PR? Don't have a machine with macOS currently installed so can't really test darwin builds. |
|
Yeah macOS is broken too so it won't be a blocker. |
matthewbauer
reviewed
Aug 2, 2018
| @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| enableParallelBuilding = true; | |||
|
|
|||
| patches = [ ./pcre.patch ]; | |||
|
|
|||
| patchPhase = lib.optionalString stdenv.isDarwin '' | |||
There was a problem hiding this comment.
@eadwu Change this to postPatch and it should fix macOS building.
There was a problem hiding this comment.
Oh didn't see patchPhase, just added it to patchPhase
|
Success on x86_64-linux (full log) Attempted: opencollada Partial log (click to expand)
|
eadwu
force-pushed
the
opencollada/resolve-pcre-declarations
branch
from
e9198c8
to
6f62bf3
Compare
matthewbauer
force-pushed
the
opencollada/resolve-pcre-declarations
branch
from
6f62bf3
to
2df3073
Compare
|
I just pushed a commit showing you what is preferred. It's a little bit hard to explain but usually using @GrahamcOfBorg build opencollada |
|
Success on x86_64-linux (full log) Attempted: opencollada Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: opencollada Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: opencollada Partial log (click to expand)
|
eadwu
force-pushed
the
opencollada/resolve-pcre-declarations
branch
from
2df3073
to
6f62bf3
Compare
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
Fixes build (or at least on nixOS)
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)