[Git][NTPsec/ntpsec][master] Remove package hints for libcap2

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
03ea8ce8 by Matt Selsky at 2017-05-19T02:44:20-04:00
Remove package hints for libcap2

- - - - -


2 changed files:

- − wafhelpers/check_cap.py
- wscript


Changes:

=====================================
wafhelpers/check_cap.py deleted
=====================================
--- a/wafhelpers/check_cap.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from waflib.Logs import pprint
-
-
-def check_cap(ctx):
-
-    if ctx.options.disable_droproot:
-        return
-    if ctx.env.DEST_OS != "linux":
-        return
-
-    ctx.check_cc(header_name="sys/prctl.h", mandatory=False)
-    ctx.check_cc(header_name="sys/capability.h", mandatory=False)
-    ctx.check_cc(lib="cap", comment="Capability library", mandatory=False)
-
-    if ((ctx.get_define("HAVE_SYS_CAPABILITY_H") and
-            ctx.get_define("HAVE_SYS_PRCTL_H") and ctx.env.LIB_CAP)):
-        ctx.define("HAVE_LINUX_CAPABILITY", 1)
-    else:
-        pprint("RED", "Warning libcap and headers not installed")
-        pprint("RED", "Fedora needs libcap-devel")
-        pprint("RED", "Debian needs libcap-dev")


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -811,8 +811,15 @@ int main(int argc, char **argv) {
                    comment="Whether sysctl interface exists")
 
     # Header/library checks
-    from wafhelpers.check_cap import check_cap
-    check_cap(ctx)
+
+    if not ctx.options.disable_droproot and ctx.env.DEST_OS == "linux":
+        ctx.check_cc(header_name="sys/prctl.h", mandatory=False)
+        ctx.check_cc(header_name="sys/capability.h", mandatory=False)
+        ctx.check_cc(lib="cap", comment="Capability library", mandatory=False)
+
+        if ((ctx.get_define("HAVE_SYS_CAPABILITY_H") and
+                ctx.get_define("HAVE_SYS_PRCTL_H") and ctx.env.LIB_CAP)):
+            ctx.define("HAVE_LINUX_CAPABILITY", 1)
 
     if ctx.options.enable_seccomp:
         if ctx.env.DEST_OS != "linux":



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/03ea8ce8851618c188a5c3e557cdf038154aa50d

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/03ea8ce8851618c188a5c3e557cdf038154aa50d
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170519/eba1169e/attachment.html>