[Git][NTPsec/ntpsec][master] Explicitly depend on libcrypto where we need it, for now

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
c3121f49 by Matt Selsky at 2019-02-23T20:06:18Z
Explicitly depend on libcrypto where we need it, for now

- - - - -


5 changed files:

- libaes_siv/wscript
- libparse/wscript
- ntpd/wscript
- ntpfrob/wscript
- wscript


Changes:

=====================================
libaes_siv/wscript
=====================================
@@ -7,4 +7,5 @@ def build(ctx):
         target="aes_siv",
         features="c cstlib bld_include" ,
         source="aes_siv.c",
+        use="CRYPTO",
     )


=====================================
libparse/wscript
=====================================
@@ -26,4 +26,5 @@ def build(ctx):
         target="parse",
         features="c cstlib bld_include src_include",
         source=libparse_source,
+        use="CRYPTO",
     )


=====================================
ntpd/wscript
=====================================
@@ -13,6 +13,7 @@ def build(ctx):
                       ],
             source=bison_source,
             target="bison_obj",
+            use="CRYPTO",
         )
 
         # Generate Bison file first.
@@ -28,6 +29,7 @@ def build(ctx):
             install_path=None,
             source=keyword_gen_source,
             target="keyword-gen",
+            use="CRYPTO",
         )
 
         # XXX: needs a dependency to rebuild ntp_keyword.h
@@ -68,7 +70,7 @@ def build(ctx):
         includes=["%s/libaes_siv/" % srcnode] + ctx.env.PLATFORM_INCLUDES,
         source=libntpd_source,
         target="libntpd_obj",
-        use="SSL CRYPTO aes_siv",
+        use="CRYPTO aes_siv",
     )
 
     ctx(
@@ -89,6 +91,7 @@ def build(ctx):
             target="refclock",
             features="c bld_include src_include",
             source=refclock_source,
+            use="CRYPTO",
         )
         use_refclock += "refclock"
 
@@ -100,6 +103,7 @@ def build(ctx):
                 #      rather than the command line for the individual drivers
                 source="refclock_%s.c" % file,
                 target="refclock_%s" % file,
+                use="CRYPTO",
             )
             use_refclock += " refclock_%s" % file
 


=====================================
ntpfrob/wscript
=====================================
@@ -10,7 +10,7 @@ def build(ctx):
         install_path='${BINDIR}',
         source=frob_sources,
         target="ntpfrob",
-        use="M RT",
+        use="M RT CRYPTO",
     )
 
     ctx.manpage(8, "ntpfrob-man.adoc")


=====================================
wscript
=====================================
@@ -246,6 +246,18 @@ def configure(ctx):
     #
     ctx.env.CFLAGS = ["-std=c99", "-D_GNU_SOURCE"] + ctx.env.CFLAGS
 
+    # We need libcrypto in the "host" variant for now (until ntp.h/nts.h are
+    # reorganized)
+    # Check via pkg-config first, then fall back to a direct search
+    if not ctx.check_cfg(
+        package='libcrypto', uselib_store='CRYPTO',
+        args=['libcrypto', '--cflags', '--libs'],
+        msg="Checking for OpenSSL/libcrypto (via pkg-config)",
+        define_name='', mandatory=False,
+    ):
+        ctx.check_cc(msg="Checking for OpenSSL's crypto library",
+                     lib="crypto", mandatory=True)
+
     msg("--- Configuring main ---")
     ctx.setenv("main", ctx.env.derive())
 



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

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/c3121f49457c14e9d5089bd942eda8684054e8dd
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/20190223/9d60a8e4/attachment-0001.html>