[Git][NTPsec/ntpsec][master] 3 commits: waf/options: pep8 fix

[Gary E. Miller]

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


Commits:
766064fa by Gary E. Miller at 2017-04-19T17:40:46-07:00
waf/options: pep8 fix

- - - - -
78a45a8c by Gary E. Miller at 2017-04-19T17:40:46-07:00
waf/configure: pep8 tweaks

- - - - -
11800b4a by Gary E. Miller at 2017-04-19T19:04:47-07:00
iwad: add --eopch option for reproduceable build.

Does nothing yet, just in waf --help

- - - - -


2 changed files:

- wafhelpers/configure.py
- wafhelpers/options.py


Changes:

=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -236,19 +236,19 @@ def cmd_configure(ctx, config):
     ctx.check_cc(lib="m", comment="Math library")
     ctx.check_cc(lib="rt", mandatory=False, comment="realtime library")
     ret = ctx.check_cc(lib="bsd", mandatory=False,
-                 comment="BSD compatibility library")
+                       comment="BSD compatibility library")
     if ret:
         ctx.env.LDFLAGS += ["-lbsd"]
 
     # -lssp and -lssp_nonshared may be needed by older gcc to
     # support "-fstack-protector-all"
     ret = ctx.check_cc(lib="ssp", mandatory=False,
-                 comment="libssp")
+                       comment="libssp")
     if ret:
         ctx.env.LDFLAGS += ["-lssp"]
 
     ret = ctx.check_cc(lib="ssp_nonshared", mandatory=False,
-                 comment="libssp_nonshared")
+                       comment="libssp_nonshared")
     if ret:
         ctx.env.LDFLAGS += ["-lssp_nonshared"]
 
@@ -306,7 +306,7 @@ def cmd_configure(ctx, config):
         # turn on some annoying warnings
         ctx.env.CFLAGS = [
             # "-Wall",                # for masochists
-            #"-Waggregate-return",    # breaks ldiv(), ntpcal_daysplit(),  etc.
+            # "-Waggregate-return",   # breaks ldiv(), ntpcal_daysplit(),  etc.
             "-Wbad-function-cast",
             "-Wfloat-equal",          # Not Ready For Prime Time
             # "-Wformat-nonliteral",  # complains about a used feature
@@ -528,7 +528,6 @@ int main(int argc, char **argv) {
     ctx.define("OPEN_BCAST_SOCKET", 1,
                comment="Whether to open a broadcast socket")
 
-
     # Find OpenSSL. Must happen before function checks
     # Versions older than 0.9.7d were deemed incompatible in NTP Classic.
     SNIP_OPENSSL_VERSION_CHECK = """
@@ -814,7 +813,6 @@ int main(int argc, char **argv) {
     ctx.write_config_header("config.h")
     ctx.end_msg("config.h", "PINK")
 
-
     def yesno(x):
         if x:
             return "Yes"


=====================================
wafhelpers/options.py
=====================================
--- a/wafhelpers/options.py
+++ b/wafhelpers/options.py
@@ -49,7 +49,8 @@ def options_cmd(ctx, config):
     grp.add_option('--enable-leap-smear', action='store_true',
                    default=False, help="Enable Leap Smearing.")
     grp.add_option('--enable-leap-testing', action='store_true',
-                   default=False, help="Enable leaps on other than 1st of month.")
+                   default=False,
+                   help="Enable leaps on other than 1st of month.")
     grp.add_option('--enable-mssntp', action='store_true',
                    default=False, help="Enable Samba MS SNTP support.")
     grp.add_option('--enable-lockclock', action='store_true',
@@ -69,6 +70,9 @@ def options_cmd(ctx, config):
     grp.add_option('--cflags', type='string', action="callback",
                    callback=callback_flags,
                    help="Users should use CFLAGS in their environment.")
+    grp.add_option( '--epoch', type='string', action="callback",
+        callback=callback_flags,
+        help="Force epoch, or use SOURCE_DATE_EPOCH in envronment")
     grp.add_option('--ldflags', type='string', action="callback",
                    callback=callback_flags,
                    help="Users should use LDFLAGS in their environment.")



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/9b6e8ecfa09b53302784abc94316369a468fc8b7...11800b4a1387aff0a5fb9a1a6946e845da24dc72

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/9b6e8ecfa09b53302784abc94316369a468fc8b7...11800b4a1387aff0a5fb9a1a6946e845da24dc72
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/20170420/80df2c79/attachment.html>