truecrypt: fix build with gcc6 patch #28982
Merged
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
|
@ryantm, thanks for your PR! By analyzing the history of the files in this pull request, we identified @davidak, @peti and @chris-martin to be potential reviewers. |
Mic92
reviewed
Sep 5, 2017
| @@ -41,7 +41,7 @@ library, use the 'NOGUI' parameter: | |||
| */ | |||
|
|
|||
| { fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper, | |||
| wxGUI ? true | |||
| wxGUI ? true, gcc | |||
There was a problem hiding this comment.
It is probably better to apply this patch instead: https://git.archlinux.org/svntogit/packages.git/tree/trunk/gcc6.patch?h=packages/truecrypt
The build was failing with gcc 6.4.0; using the samee gcc6 patch Arch Linux uses fixed the build. This commit also refactors out the builder.sh possibly fixing the NOGUI make flag option.
ryantm
changed the title
|
@Mic92 Okay, I incorporated your review suggestion. Can you review again, please? |
|
cc @viric |
|
Thanks! |
|
also backported. |
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.
The build was failing with gcc 6.4.0; pinning to gcc5 (gcc-5.4.0)
allows the build to complete.
Fixing as part of #28643.