[Git][NTPsec/ntpsec][master] Remove build scaffolding for OpenSSL from the "host" variant of the build

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
cfa4495b by Matt Selsky at 2019-03-09T20:11:48Z
Remove build scaffolding for OpenSSL from the "host" variant of the build

OpenSSL is only needed in the "main" variant of the build as of ("Split nts.h
into 2 parts so nts.h doesn't need openssl/ssh.h") so we don't need to check
for it in the "host" variant and we also don't need to list it as a build
dependency in several waf units.

This partially reverts ("Explicitly depend on libcrypto where we need it, for
now")

Fixes GitLab issue 573

- - - - -


5 changed files:

- libparse/wscript
- ntpd/wscript
- ntpfrob/wscript
- tests/wscript
- wscript


Changes:

=====================================
libparse/wscript
=====================================
@@ -27,5 +27,4 @@ def build(ctx):
         features="c cstlib",
         includes=[ctx.bldnode.parent.abspath(), "../include"],
         source=libparse_source,
-        use="CRYPTO",
     )


=====================================
ntpd/wscript
=====================================
@@ -10,7 +10,6 @@ def build(ctx):
             includes=[ctx.bldnode.parent.abspath(), "../include", "."],
             source=bison_source,
             target="bison_obj",
-            use="CRYPTO",
         )
 
         # Generate Bison file first.
@@ -24,7 +23,6 @@ def build(ctx):
             install_path=None,
             source=keyword_gen_source,
             target="keyword-gen",
-            use="CRYPTO",
         )
 
         # XXX: needs a dependency to rebuild ntp_keyword.h
@@ -87,7 +85,6 @@ def build(ctx):
             features="c",
             includes=[ctx.bldnode.parent.abspath(), "../include"],
             source=refclock_source,
-            use="CRYPTO",
         )
         use_refclock += "refclock"
 
@@ -100,7 +97,6 @@ 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
=====================================
@@ -8,7 +8,7 @@ def build(ctx):
         install_path='${BINDIR}',
         source=frob_sources,
         target="ntpfrob",
-        use="M RT CRYPTO",
+        use="M RT",
     )
 
     ctx.manpage(8, "ntpfrob-man.adoc")


=====================================
tests/wscript
=====================================
@@ -84,7 +84,7 @@ def build(ctx):
             libpath=["libparse"],
             source=libparse_source,
             target="test_libparse",
-            use="unity ntp parse M PTHREAD CRYPTO RT SOCKET NSL",
+            use="unity ntp parse M PTHREAD RT SOCKET NSL",
         )
 
     ntpd_source = [


=====================================
wscript
=====================================
@@ -254,18 +254,6 @@ 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/cfa4495b2c78233933785df0beb07845f22debd8

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/cfa4495b2c78233933785df0beb07845f22debd8
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/20190309/fa1d2a6f/attachment-0001.html>