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.

Sign up for GitHub

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

Jump to bottom

gnuradio: fix build for gcc6 #29740

Merged
merged 1 commit into from Sep 26, 2017
Merged

gnuradio: fix build for gcc6 #29740

merged 1 commit into from Sep 26, 2017

Conversation

rvl
Copy link
Contributor

@rvl rvl commented Sep 24, 2017 •
edited

Patch comes via Arch Linux via Fedora. It should hopefully fix the build for gcc7 (in future) as well as gcc6.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@rvl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bjornfor, @fpletz and @FRidh to be potential reviewers.

@Mic92
Copy link
Member

Mic92 commented Sep 24, 2017

Was gnuradio broken before? https://hydra.nixos.org/eval/1395695?filter=gnuradio&compare=1395588&full=

@rvl
Copy link
Contributor Author

rvl commented Sep 24, 2017

oops! I was looking at the wrong branch https://hydra.nixos.org/eval/1395575?filter=gnuradio&compare=1395259&full=

@rvl
Copy link
Contributor Author

rvl commented Sep 24, 2017

Have removed references to 17.09 release.

@lukeadams lukeadams mentioned this pull request Sep 25, 2017
Merged
8 tasks
@lukeadams
Copy link
Contributor

Any chance this could be submitted upstream?

@rvl rvl mentioned this pull request Sep 25, 2017
Closed
@rvl
Copy link
Contributor Author

rvl commented Sep 25, 2017

@lukeadams I have raised an issue upstream gnuradio/gnuradio#1470

joachifm
joachifm reviewed Sep 25, 2017
View reviewed changes
pkgs/applications/misc/gnuradio/default.nix Outdated
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

patches = [ ./gnuradio-gcc7.patch ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there an external source for the patch? If possible, fetch it instead of checking it into the repository.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The patch came from the Arch Linux packages git repo.

I have changed this PR to not use a patch, but instead apply its essential parts as NIX_CFLAGS_COMPILE and substituteInPlace.

joachifm
joachifm reviewed Sep 25, 2017
View reviewed changes
pkgs/applications/misc/gnuradio/default.nix Outdated
@@ -41,8 +41,14 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

patchPhase = ''
Copy link
Contributor

Choose a reason for hiding this comment

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

Great. It's generally better to use postPatch instead of overriding the entire patch phase, on the off change that somebody wanted to easily apply other patches by overrding patches.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, updated

@joachifm joachifm merged commit 3766637 into NixOS:master Sep 26, 2017
globin pushed a commit that referenced this pull request Sep 26, 2017
@rvl @globin
gnuradio: fix build for gcc6 and newer boost (#29740)
10bb7fd 
(cherry picked from commit 3766637)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joachifm joachifm joachifm left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rvl @mention-bot @Mic92 @lukeadams @joachifm