[Git][NTPsec/ntpsec][master] waafhelpers: partial fix for broken openssl on darwin

[Gary E. Miller]

Gary E. Miller pushed to branch master at NTPsec / ntpsec


Commits:
5536a11e by Gary E. Miller at 2017-02-05T19:32:47-08:00
waafhelpers: partial fix for broken openssl on darwin

- - - - -


2 changed files:

- wafhelpers/check_openssl.py
- wafhelpers/probes.py


Changes:

=====================================
wafhelpers/check_openssl.py
=====================================
--- a/wafhelpers/check_openssl.py
+++ b/wafhelpers/check_openssl.py
@@ -25,7 +25,9 @@ def configure_openssl(ctx):
     )
 
     for hdr in headers:
-        if not ctx.check_cc(header_name=hdr, comment="<%s> header" % hdr):
+        if not ctx.check_cc(header_name=hdr, comment="<%s> header" % hdr,
+            includes=ctx.env.PLATFORM_INCLUDES,
+            ):
             OPENSSL_HEADERS = False
 
     if not ctx.check_cc(lib="crypto"):
@@ -33,11 +35,12 @@ def configure_openssl(ctx):
 
     if OPENSSL_HEADERS and OPENSSL_LIB:
         ctx.check_cc(
+            comment="OpenSSL support",
+            execute=True,
             fragment=OPENSSL_FRAG % "\n".join(["#include <%s>" % x
                                                for x in headers]),
-            execute=True,
-            use="CRYPTO",
+            includes=ctx.env.PLATFORM_INCLUDES,
             msg="Checking if OpenSSL works",
-            comment="OpenSSL support"
+            use="CRYPTO",
         )
 


=====================================
wafhelpers/probes.py
=====================================
--- a/wafhelpers/probes.py
+++ b/wafhelpers/probes.py
@@ -13,12 +13,14 @@ def probe_header_with_prerequisites(ctx, header, prerequisites, use=None):
         have_name = "HAVE_%s" \
             % header.replace(".", "_").replace("/", "_").upper()
         ctx.check_cc(
-            fragment=src,
+            comment="<%s> header" % header,
             define_name=have_name,
+            fragment=src,
+            includes=ctx.env.PLATFORM_INCLUDES,
+            mandatory=False,
             msg="Checking for header %s" % header,
             use=use or [],
-            mandatory=False,
-            comment="<%s> header" % header)
+        )
         return ctx.get_define(have_name)
 
 
@@ -34,12 +36,14 @@ def probe_function_with_prerequisites(ctx, function, prerequisites, use=None):
 """ % function
         have_name = "HAVE_%s" % function.upper()
         ctx.check_cc(
-            fragment=src,
+            comment="Whether %s() exists" % function,
             define_name=have_name,
+            fragment=src,
+            includes=ctx.env.PLATFORM_INCLUDES,
+            mandatory=False,
             msg="Checking for function %s" % function,
             use=use or [],
-            mandatory=False,
-            comment="Whether %s() exists" % function)
+        )
         return ctx.get_define(have_name)
 
 # end



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/5536a11e0d1b649bbeb545e59a6f71186e3f1658
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170206/77c85fb3/attachment.html>