[Git][NTPsec/ntpsec][master] check_sanity() is now used in only 1 place. No need to keep it separate.

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
054b1cb7 by Matt Selsky at 2017-04-18T01:04:11-04:00
check_sanity() is now used in only 1 place. No need to keep it separate.

- - - - -


2 changed files:

- wafhelpers/check_pthread.py
- − wafhelpers/tool.py


Changes:

=====================================
wafhelpers/check_pthread.py
=====================================
--- a/wafhelpers/check_pthread.py
+++ b/wafhelpers/check_pthread.py
@@ -1,4 +1,4 @@
-from wafhelpers.tool import check_sanity
+from waflib.Logs import pprint
 
 PTHREAD_FRAG = """
 #include <pthread.h>
@@ -54,3 +54,16 @@ def check_pthread_run(ctx):
     else:
         ctx.env.PTHREAD_ENABLE = True
         ctx.define("HAVE_PTHREAD", 1, comment="pthread support")
+
+
+def check_sanity(ctx, cond, lib):
+    define = "HAVE_%s" % lib.upper()
+
+    if cond and (not ctx.get_define(define)):
+        pprint("RED",
+               "Warning %s headers detected, binaries do not build/run"
+               % lib)
+    elif (not cond) and ctx.get_define(define):
+        pprint("RED",
+               "Warning %s headers not detected, binaries build/run"
+               % lib)


=====================================
wafhelpers/tool.py deleted
=====================================
--- a/wafhelpers/tool.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from waflib.Logs import pprint
-
-
-def check_sanity(ctx, cond, lib):
-        define = "HAVE_%s" % lib.upper()
-
-        if cond and (not ctx.get_define(define)):
-                pprint("RED",
-                       "Warning %s headers detected, binaries do not build/run"
-                       % lib)
-        elif (not cond) and ctx.get_define(define):
-                pprint("RED",
-                       "Warning %s headers not detected, binaries build/run"
-                       % lib)



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/054b1cb72db398d7b305fbcaab240a0d7cebd34d

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/054b1cb72db398d7b305fbcaab240a0d7cebd34d
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/20170418/ae295992/attachment.html>