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

qt5: fix cmake cleanup on darwin #31213

Merged
merged 1 commit into from Nov 4, 2017
Merged

qt5: fix cmake cleanup on darwin #31213

merged 1 commit into from Nov 4, 2017

Conversation

acowley
Copy link
Contributor

@acowley acowley commented Nov 3, 2017

This fixes the case where the find command does not return any
files.

Motivation for this change

This was breaking the end of the installPhase of the pcl package on darwin.

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
    • other Linux distributions
  • 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.

@acowley
qt5: fix cmake cleanup on darwin
66c0193 
This fixes the case where the `find` command does not return any
files.
orivej
orivej approved these changes Nov 3, 2017
View reviewed changes
Copy link
Contributor

@orivej orivej left a comment •
edited

Choose a reason for hiding this comment

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

Estimating rebuild amount by counting changed Hydra jobs.
    141 x86_64-darwin

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Nov 4, 2017
@LnL7
Copy link
Member

LnL7 commented Nov 4, 2017

@GrahamcOfBorg pcl

GrahamcOfBorg
GrahamcOfBorg approved these changes Nov 4, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

For system: x86_64-linux


  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
 23 16.0M   23 3784k    0     0  3784k      0  0:00:04 --:--:--  0:00:04 5026k
 62 16.0M   62 10.0M    0     0  10.0M      0  0:00:01  0:00:01 --:--:-- 5728k
100 16.0M  100 16.0M    0     0  8206k      0  0:00:02  0:00:02 --:--:-- 6056k

fetching path ‘/nix/store/cfywmws250ydn7p01ljvgblcvzv0sdba-pcl-1.8.1’...

*** Downloading ‘https://cache.nixos.org/nar/07dn5sn8p9p40n7hj5ff2wvqmmwjdfx1zyygmajlm5yknqgvl81z.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/cfywmws250ydn7p01ljvgblcvzv0sdba-pcl-1.8.1’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
 18 13.8M   18 2657k    0     0  2657k      0  0:00:05 --:--:--  0:00:05 3942k
 64 13.8M   64 9121k    0     0  9121k      0  0:00:01  0:00:01 --:--:-- 4960k
100 13.8M  100 13.8M    0     0  7108k      0  0:00:02  0:00:02 --:--:-- 4925k
100 13.8M  100 13.8M    0     0  7108k      0  0:00:02  0:00:02 --:--:-- 4925k

/nix/store/cfywmws250ydn7p01ljvgblcvzv0sdba-pcl-1.8.1

GrahamcOfBorg
GrahamcOfBorg approved these changes Nov 4, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

/nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1/lib/libpcl_segmentation.1.8.1.dylib: fixing dylib
/nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1/lib/libpcl_stereo.1.8.1.dylib: fixing dylib
/nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1/lib/libpcl_surface.1.8.1.dylib: fixing dylib
/nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1/lib/libpcl_tracking.1.8.1.dylib: fixing dylib
/nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1/lib/libpcl_visualization.1.8.1.dylib: fixing dylib
stripping (with flags -S) in /nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1/lib  /nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1/bin
patching script interpreter paths in /nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1
copying 1 paths...
copying path '/nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1'...
/nix/store/sdkp97xid0ca22np8lqcsrf86fvm3350-pcl-1.8.1

@LnL7 LnL7 merged commit a9f13a4 into NixOS:master Nov 4, 2017
@LnL7
Copy link
Member

LnL7 commented Nov 4, 2017

@acowley any idea if this is also a problem on 17.09?

@acowley
Copy link
Contributor Author

acowley commented Nov 4, 2017

With respect to pcl: not directly. As I understand it, qt4 on Darwin is in some sort of deprecated/unmaintained state (I am referring to upstream; we could try to keep it building). I recently changed our pcl package to use qt5, but that change is not in the 17.09 release. I may also have done some work on vtk (through which pcl depends on qt) to get to this point, and I am not sure how much of that is in 17.09.

If you are asking about qt5 in 17.09, I’d not seen this particular issue before. The change in this PR seems like an absolute improvement. I feel like backporting the change would be good, but maybe that’s naïve on my part.

@acowley acowley deleted the qt5-cmake-cleanup branch November 14, 2017 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orivej orivej orivej approved these changes

@LnL7 LnL7 LnL7 approved these changes

@GrahamcOfBorg GrahamcOfBorg GrahamcOfBorg approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@acowley @LnL7 @orivej @GrahamcOfBorg