[Git][NTPsec/ntpsec][master] 2 commits: waf cleanup: remove PLATFORM_*

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
1700afae by Hal Murray at 2019-09-27T20:51:33Z
waf cleanup: remove PLATFORM_*

- - - - -
dbc0d8ef by Hal Murray at 2019-09-27T20:51:33Z
Log warning for ignored config of memlock

- - - - -


6 changed files:

- libntp/wscript
- ntpd/ntp_config.c
- ntpd/wscript
- tests/wscript
- wafhelpers/probes.py
- wscript


Changes:

=====================================
libntp/wscript
=====================================
@@ -41,7 +41,7 @@ def build(ctx):
     # C library
     ctx(
         features="c cstlib",
-        includes=[ctx.bldnode.parent.abspath(), "../include"] + ctx.env.PLATFORM_INCLUDES,
+        includes=[ctx.bldnode.parent.abspath(), "../include"],
         source=libntp_source + libntp_source_sharable,
         target="ntp",
         use="SSL CRYPTO",
@@ -51,7 +51,7 @@ def build(ctx):
     ctx(
         features="c cshlib pyext",
         install_path='${PYTHONARCHDIR}/ntp',
-        includes=[ctx.bldnode.parent.abspath(), "../include"] + ctx.env.PLATFORM_INCLUDES,
+        includes=[ctx.bldnode.parent.abspath(), "../include"],
         source=["pymodule.c"] + libntp_source_sharable,
         target="../pylib/ntpc",  # Put the output in the pylib directory
         use="M RT CRYPTO",


=====================================
ntpd/ntp_config.c
=====================================
@@ -1893,7 +1893,7 @@ config_rlimit(
 			break;
 
 		case T_Memlock:
-			/* ignore, for backward compatibility */
+			msyslog(LOG_WARNING, "CONFIG: memlock ignored");
 			break;
 
 		case T_Stacksize:


=====================================
ntpd/wscript
=====================================
@@ -60,7 +60,7 @@ def build(ctx):
 
     ctx(
         features="c",
-        includes=[ctx.bldnode.parent.abspath(), "../include", "../libaes_siv"] + ctx.env.PLATFORM_INCLUDES,
+        includes=[ctx.bldnode.parent.abspath(), "../include", "../libaes_siv"],
         source=libntpd_source,
         target="libntpd_obj",
         use="CRYPTO aes_siv",
@@ -121,8 +121,7 @@ def build(ctx):
         features="c rtems_trace cprogram",
         includes=[
             ctx.bldnode.parent.abspath(), "../include",
-            "%s/host/ntpd/" % ctx.bldnode.parent.abspath(), "."
-        ] + ctx.env.PLATFORM_INCLUDES,
+            "%s/host/ntpd/" % ctx.bldnode.parent.abspath(), "." ],
         install_path='${SBINDIR}',
         source=ntpd_source,
         target="ntpd",


=====================================
tests/wscript
=====================================
@@ -59,7 +59,7 @@ def build(ctx):
         target="test_libntp",
         install_path=None,
         defines=unity_config + ["TEST_LIBNTP=1"],
-        includes=[ctx.bldnode.parent.abspath(), "../include", "unity", "common"] + ctx.env.PLATFORM_INCLUDES,
+        includes=[ctx.bldnode.parent.abspath(), "../include", "unity", "common"],
         use="unity ntp parse M PTHREAD CRYPTO RT SOCKET NSL",
         source=libntp_source,
     )
@@ -77,7 +77,7 @@ def build(ctx):
         ctx.ntp_test(
             defines=unity_config + ["TEST_LIBPARSE=1"],
             features="c cprogram test",
-            includes=[ctx.bldnode.parent.abspath(), "../include", "unity"] + ctx.env.PLATFORM_INCLUDES,
+            includes=[ctx.bldnode.parent.abspath(), "../include", "unity"],
             install_path=None,
             lib=["parse"],
             libpath=["libparse"],


=====================================
wafhelpers/probes.py
=====================================
@@ -16,7 +16,6 @@ def probe_header(ctx, header, prerequisites, mandatory=False, use=None):
         comment="<%s> header" % header,
         define_name=have_name,
         fragment=src,
-        includes=ctx.env.PLATFORM_INCLUDES,
         mandatory=mandatory,
         msg="Checking for header %s" % header,
         use=use or [],
@@ -39,7 +38,6 @@ def probe_function(ctx, function, prerequisites, mandatory=False, use=None):
         comment="Whether %s() exists" % function,
         define_name=have_name,
         fragment=src,
-        includes=ctx.env.PLATFORM_INCLUDES,
         mandatory=mandatory,
         msg="Checking for function %s" % function,
         use=use or [],


=====================================
wscript
=====================================
@@ -544,21 +544,19 @@ int main(int argc, char **argv) {
     ctx.env.CFLAGS = ['-DUNITY_EXCLUDE_FLOAT_PRINT'] + ctx.env.CFLAGS
 
     # XXX: hack
-    if ctx.env.DEST_OS in ["freebsd", "openbsd"]:
-        ctx.env.PLATFORM_INCLUDES = ["/usr/local/include"]
-        ctx.env.PLATFORM_LIBPATH = ["/usr/local/lib"]
+    if ctx.env.DEST_OS in ["freebsd"]:
+        ctx.env.INCLUDES = ["/usr/local/include"]
+        ctx.env.LIBPATH = ["/usr/local/lib"]
     elif ctx.env.DEST_OS == "netbsd" and os.path.isdir("/usr/pkg/include"):
         ctx.env.INCLUDES = ["/usr/pkg/include"]
         ctx.env.LIBPATH = ["/usr/pkg/lib"]
         ctx.env.LDFLAGS += ["-rpath=/usr/pkg/lib"]
-    elif ctx.env.DEST_OS == "win32":
-        ctx.load("msvc")
     elif ctx.env.DEST_OS == "darwin":
         # macports location
         if os.path.isdir("/opt/local/include"):
-            ctx.env.PLATFORM_INCLUDES = ["/opt/local/include"]
+            ctx.env.INCLUDES = ["/opt/local/include"]
         if os.path.isdir("/opt/local/lib"):
-            ctx.env.PLATFORM_LIBPATH = ["/opt/local/lib"]
+            ctx.env.LIBPATH = ["/opt/local/lib"]
         # OS X needs this for IPv6
         ctx.define("__APPLE_USE_RFC_3542", 1,
                    comment="Needed for IPv6 support")



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/52189161371a74eb4b047ee4d011e044ca378213...dbc0d8ef4453fb04f6f342f0e4302a55d0dbeccd

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/52189161371a74eb4b047ee4d011e044ca378213...dbc0d8ef4453fb04f6f342f0e4302a55d0dbeccd
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/20190928/a4ecbd92/attachment-0001.htm>