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

ntopng: Add patch needed to build with newer libpcap #69080

Merged
merged 2 commits into from Sep 19, 2019
Merged

ntopng: Add patch needed to build with newer libpcap #69080

merged 2 commits into from Sep 19, 2019

Conversation

avdv
Copy link
Member

@avdv avdv commented Sep 19, 2019

Motivation for this change

Fix ntopng build https://hydra.nixos.org/build/100449995

#68361

Fixes build errors for the third-party mongoose module:

In file included from
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap.h:43,
                 from /build/ntopng-2.0/include/ntop_includes.h:93,
                                  from src/HTTPserver.cpp:22:
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap/pcap.h:958: note: this is the location of the previous definition
   #define INVALID_SOCKET -1

src/../third-party/mongoose/mongoose.c:270:13: error: multiple types in one declaration
 typedef int SOCKET;
             ^~~~~~
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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@avdv
ntopng: Add patch needed to build with newer libpcap
c4486a0 
Fixes build errors for the third-party mongoose module:
```
In file included from
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap.h:43,
                 from /build/ntopng-2.0/include/ntop_includes.h:93,
                                  from src/HTTPserver.cpp:22:
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap/pcap.h:958: note: this is the location of the previous definition
   #define INVALID_SOCKET -1

src/../third-party/mongoose/mongoose.c:270:13: error: multiple types in one declaration
 typedef int SOCKET;
             ^~~~~~
```
@ofborg ofborg bot requested a review from bjornfor September 19, 2019 07:30
teto
teto requested changes Sep 19, 2019
View reviewed changes
Copy link
Member

@teto teto left a comment

Choose a reason for hiding this comment

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

You need to remove the broken = true; # broken since commit "libpcap: 1.8.1 -> 1.9.0" as well

@avdv
Copy link
Member Author

avdv commented Sep 19, 2019

You need to remove the broken = true; # broken since commit "libpcap: 1.8.1 -> 1.9.0" as well

Thanks, done.

Maybe it would be a good idea to update to version 3.8 someday...

@teto
Copy link
Member

teto commented Sep 19, 2019

up for it ? It may make the patch irrelevant so it might be best

@avdv
Copy link
Member Author

avdv commented Sep 19, 2019

up for it ?

I gave it a shot, but it's not straight-forward.

It may make the patch irrelevant so it might be best

It indeed makes all patches irrelevant, but the build changed more significantly, so postponed for now.

@teto teto merged commit e9322d4 into NixOS:master Sep 19, 2019
@teto
Copy link
Member

teto commented Sep 19, 2019

ok thank you.

@avdv avdv deleted the ntopng-zhf-fix branch September 19, 2019 12:23
@avdv avdv mentioned this pull request Sep 19, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teto teto teto requested changes

@bjornfor bjornfor Awaiting requested review from bjornfor

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@avdv @teto