[Git][NTPsec/ntpsec][master] Makes pythonize-header use waf's Python.

Matt Selsky gitlab at mg.gitlab.com
Sat Mar 31 18:21:29 UTC 2018


Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
25149c70 by Fred Wright at 2018-03-31T18:20:19Z
Makes pythonize-header use waf's Python.

Aside from the nominal inconsistency of running Python-based
build helpers with a different version of Python than the one
running waf, this can actually fail when the system default Python
is too old for the helper code.  This change arranges to use the
waf Python for pythonize-header, similarly to what is already
being done for the tests.

TESTED:
With default Python set to 2.5, and 2.7 explicitly invoked to run waf,
verified that the build fails without this change and works with it.

- - - - -


1 changed file:

- pylib/wscript


Changes:

=====================================
pylib/wscript
=====================================
--- a/pylib/wscript
+++ b/pylib/wscript
@@ -34,7 +34,7 @@ def build(ctx):
     ctx(
         before=['pyc', 'pyo'],
         cwd=srcnode,
-        rule='${SRC} >${TGT}',
+        rule='${PYTHON} ${SRC} >${TGT}',
         source=["../wafhelpers/pythonize-header", "../include/ntp_control.h"],
         target=target1,
     )
@@ -42,7 +42,7 @@ def build(ctx):
     ctx(
         before=['pyc', 'pyo'],
         cwd=srcnode,
-        rule='${SRC} >${TGT}',
+        rule='${PYTHON} ${SRC} >${TGT}',
         source=["../wafhelpers/pythonize-header", "../include/ntp.h"],
         target=target2,
     )



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

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/25149c701ef83cfdfbd1dd1436583a2cc90ae34b
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/20180331/7d28c46e/attachment.html>


More information about the vc mailing list