[Git][NTPsec/ntpsec][master] Clean up args to pkg-config for ssl/crypto library checks

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
f0dc1745 by Matt Selsky at 2020-04-14T03:07:08+00:00
Clean up args to pkg-config for ssl/crypto library checks

This completes the original clean up from commit
6d17955b03ca65d67f2cc2ceba01bd60e07d5fd4 ("Remove dependency on specific
version of OpenSSL") and removes the now unused extra argument, which only
server add additional output from pkg-config (which is then ignored by waf).

Before:
% /usr/bin/pkg-config libcrypto --cflags --libs libcrypto
-I/usr/include -L/usr/lib -lcrypto

Now:
% /usr/bin/pkg-config libcrypto --cflags --libs
-I/usr/include -L/usr/lib -lcrypto

- - - - -


1 changed file:

- wscript


Changes:

=====================================
wscript
=====================================
@@ -583,7 +583,7 @@ int main(int argc, char **argv) {
         # Check via pkg-config first, then fall back to a direct search
         if not ctx.check_cfg(
             package='libssl', uselib_store='SSL',
-            args=['libssl', '--cflags', '--libs'],
+            args=['--cflags', '--libs'],
             msg="Checking for OpenSSL/libssl (via pkg-config)",
             define_name='', mandatory=False,
         ):
@@ -593,7 +593,7 @@ int main(int argc, char **argv) {
     # 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'],
+        args=['--cflags', '--libs'],
         msg="Checking for OpenSSL/libcrypto (via pkg-config)",
         define_name='', mandatory=False,
     ):



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

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/f0dc17457c280c48b027b356a3f4adcc530ee254
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/20200414/f500e2e1/attachment-0001.htm>