[Git][NTPsec/ntpsec][master] 2 commits: waf: -flto no longer breaks endiannes check, still commented out

[Gary E. Miller]

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


Commits:
0de605f1 by Gary E. Miller at 2017-02-16T12:59:45-08:00
waf: -flto no longer breaks endiannes check, still commented out

now breaks ntpd link...

- - - - -
693e6a30 by Gary E. Miller at 2017-02-16T13:06:56-08:00
waf: remove FORTIFY option, never worked, not needed.

gcc turns on FORTIFY of any -Ox, if we turn on FORTIFY it
causes copious warnings.

- - - - -


2 changed files:

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


Changes:

=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -3,7 +3,7 @@ from __future__ import print_function
 import os
 from wafhelpers.probes \
     import probe_header_with_prerequisites, probe_function_with_prerequisites
-from wafhelpers.util import msg, msg_setting
+from wafhelpers.util import msg, msg_setting, parse_version
 
 
 def cmd_configure(ctx, config):
@@ -14,7 +14,6 @@ def cmd_configure(ctx, config):
     ctx.load('waf', tooldir='wafhelpers/')
     ctx.load('waf_unit_test')
 
-    from wafhelpers.util import parse_version
     parse_version(config)
 
     ctx.env.NTPSEC_VERSION_MAJOR = config["NTPSEC_VERSION_MAJOR"]
@@ -193,10 +192,10 @@ def cmd_configure(ctx, config):
 
         return
 
-    # This needs to be at the top since it modifies CC and AR
-    if ctx.options.enable_fortify:
-        from wafhelpers.check_fortify import check_fortify
-        check_fortify(ctx)
+    # These are required by various refclocks
+    # needs to be tested before CFLAGS are set
+    if ctx.check_endianness() == "big":
+        ctx.define("WORDS_BIGENDIAN", 1)
 
     cc_test_flags = [
         ('PIE', '-pie -fPIE'),
@@ -242,7 +241,7 @@ def cmd_configure(ctx, config):
             ('relrow', "-Wl,-z,relro"),  # hardening, marks some read only,
             ]
 
-    # XXX: -flto breaks endianness test???
+    # XXX: -flto currently breaks link of ntpd
     if ctx.env.HAS_LTO and False:
         ctx.env.CFLAGS += [
             "-flto",
@@ -590,10 +589,6 @@ def cmd_configure(ctx, config):
                "same sockets on alternate interfaces, required "
                "by Linux at least")
 
-    # These are required by various refclocks
-    if ctx.check_endianness() == "big":
-        ctx.define("WORDS_BIGENDIAN", 1)
-
     from wafhelpers.check_vsprintfm import check_vsprintfm
     check_vsprintfm(ctx)
 


=====================================
wafhelpers/options.py
=====================================
--- a/wafhelpers/options.py
+++ b/wafhelpers/options.py
@@ -70,8 +70,6 @@ def options_cmd(ctx, config):
     grp.add_option('--ldflags', type='string', action="callback",
                    callback=callback_flags,
                    help="Users should use LDFLAGS in their environment.")
-    grp.add_option('--enable-fortify', action='store_true',
-                   help="Enable HP Fortify.")
     grp.add_option('--fortify-flags', type='string', action='store',
                    help="Fortify flags.")
     grp.add_option('--check', action='store_true', default=False,



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/a6cea9b19c9ce70a8f897951f571800678c124c3...693e6a308e5f6bf1e6c6caabd426580413015c87
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170216/3e893dc6/attachment.html>