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.

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

hyperscan: 5.1.0 -> 5.1.1 #59500

Merged
merged 3 commits into from May 12, 2019
Merged

hyperscan: 5.1.0 -> 5.1.1 #59500

merged 3 commits into from May 12, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Apr 14, 2019

  • provide misc utils needed by build
Motivation for this change

https://github.com/intel/hyperscan/releases/tag/v5.1.1

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
hyperscan: 5.1.0 -> 5.1.1
109e19f 
* provide misc utils needed by build
tomberek
tomberek requested changes Apr 14, 2019
View reviewed changes
Copy link
Contributor

@tomberek tomberek left a comment

Choose a reason for hiding this comment

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

Reverse dependency rspamd failed to build:

builder for '/nix/store/bxhx78ybg92zycgb2am7wnfn05bcanvj-rspamd-1.9.0.drv' failed with exit code 2; last 10 log lines:
   #include "hs.h"
            ^~~~~~
  compilation terminated.
  make[2]: *** [src/CMakeFiles/rspamd-server.dir/build.make:618: src/CMakeFiles/rspamd-server.dir/libutil/map_helpers.c.o] Error 1
  make[2]: *** Waiting for unfinished jobs....
  make[1]: *** [CMakeFiles/Makefile2:1541: src/CMakeFiles/rspamd-server.dir/all] Error 2
  make[1]: *** Waiting for unfinished jobs....
  [ 62%] Linking C shared library libTH.so
  [ 62%] Built target TH
  make: *** [Makefile:130: all] Error 2

@c0bw3b c0bw3b self-assigned this May 11, 2019
@c0bw3b
hyperscan: build shared libs only by default
0167dab 
Only consumer now (rspamd) needs only the shared libs
+ add a switch to build both shared and static if needed
+ cleaner outputs (previously there was static lib and symlink to shared lib in $dev)
+ fix pkgconfig template for v5.1.1 otherwise "includedir" path is wrong
@c0bw3b
Copy link
Contributor

c0bw3b commented May 11, 2019

Well not sure where nm should come from on Darwin so I'm going to restrict this to Linux platforms, as is rspamd already.

@c0bw3b
hyperscan: restrict to x86_64-linux
2cff871 
Fails to find 'nm' on x64 darwin
tomberek
tomberek approved these changes May 11, 2019
View reviewed changes
Copy link
Contributor

@tomberek tomberek left a comment

Choose a reason for hiding this comment

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

Builds and runs now. Including rspamd.

@c0bw3b
Copy link
Contributor

c0bw3b commented May 12, 2019

@GrahamcOfBorg build rspamd

@c0bw3b c0bw3b merged commit eb327ed into NixOS:master May 12, 2019
tadeokondrak pushed a commit to tadeokondrak/nixpkgs that referenced this pull request May 17, 2019
@dtzWill @tadeokondrak
hyperscan: 5.1.0 -> 5.1.1 (NixOS#59500)
86f1694 
* hyperscan: 5.1.0 -> 5.1.1

* provide misc utils needed by build

* hyperscan: build shared libs only by default

Only consumer now (rspamd) needs only the shared libs
+ add a switch to build both shared and static if needed
+ cleaner outputs (previously there was static lib and symlink to shared lib in $dev)
+ fix pkgconfig template for v5.1.1 otherwise "includedir" path is wrong

* hyperscan: restrict to x86_64-linux

Fails to find 'nm' on x64 darwin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomberek tomberek tomberek approved these changes

Assignees

@c0bw3b c0bw3b

Labels
8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtzWill @c0bw3b @tomberek @GrahamcOfBorg