[Git][NTPsec/ntpsec][master] MacOS: now compiles using macports.

[Gary E. Miller]

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


Commits:
a5fa176d by Gary E. Miller at 2017-01-20T15:54:58-08:00
MacOS: now compiles using macports.

PYTHONPATH still a problem

- - - - -


2 changed files:

- INSTALL
- wafhelpers/configure.py


Changes:

=====================================
INSTALL
=====================================
--- a/INSTALL
+++ b/INSTALL
@@ -57,10 +57,11 @@ libsodium::
    but we judge this creates an unacceptable risk should a CVE be issued
    against it
 
-   Gentoo: dev-libs/libsodium
    CentOS: libsodium in epel ("Extra Packages for Enterprise Linux").
-   Ubuntu 14.04 LTS: and older: https://gist.github.com/jonathanpmartins/2510f38abee1e65c6d92
    Debian Wheezy and older: https://sourceforge.net/projects/debiannoofficial/files/wheezy/
+   Gentoo: dev-libs/libsodium
+   MacOS, macports: libsodium
+   Ubuntu 14.04 LTS: and older: https://gist.github.com/jonathanpmartins/2510f38abee1e65c6d92
 
 libcap::
    Required on Linux, to support dropping root.


=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -248,7 +248,7 @@ def cmd_configure(ctx, config):
                comment="Operating system detected by Python (%s)" % platform)
 
     # XXX: hack
-    if ctx.env.PLATFORM_TARGET in ["freebsd", "osx", "openbsd"]:
+    if ctx.env.PLATFORM_TARGET in ["freebsd", "openbsd"]:
         ctx.env.PLATFORM_INCLUDES = ["/usr/local/include"]
         ctx.env.PLATFORM_LIBPATH = ["/usr/local/lib"]
     elif ctx.env.PLATFORM_TARGET == "netbsd":
@@ -256,13 +256,14 @@ def cmd_configure(ctx, config):
         ctx.env.PLATFORM_LIBPATH = ["/usr/lib", "/usr/pkg/lib"]
     elif ctx.env.PLATFORM_TARGET == "win":
         ctx.load("msvc")
-
-    # OS X needs this for IPv6
-    if ctx.env.PLATFORM_TARGET == "osx":
+    elif ctx.env.PLATFORM_TARGET == "osx":
+        # macports location
+        ctx.env.PLATFORM_INCLUDES = ["/opt/local/include"]
+        ctx.env.PLATFORM_LIBPATH = ["/opt/local/lib"]
+	# OS X needs this for IPv6
         ctx.define("__APPLE_USE_RFC_3542", 1,
                    comment="Needed for IPv6 support")
-
-    if sys.platform.startswith("sunos"):
+    elif sys.platform.startswith("sunos"):
         ctx.define("_POSIX_PTHREAD_SEMANTICS", "1", quote=False,
                    comment="Needed for POSIX function definitions on Solaris")
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/a5fa176dcae2ddb4dcf90a7929f018947d219009
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170120/55987f11/attachment.html>