The branch, master has been updated
via 9740259... buildtools/wafsamba: make sure CHECK_FUNC() and
CHECK_VARIABLE() work with -O3 in the CFLAGS
from 367ba43... tdb-waf: added build of manpages and config options for
RPM build
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 974025944e6bd59a79638f185a6268903f396fa6
Author: Stefan Metzmacher <[email protected]>
Date: Tue Apr 13 12:56:19 2010 +0200
buildtools/wafsamba: make sure CHECK_FUNC() and CHECK_VARIABLE() work with
-O3 in the CFLAGS
'CFLAGS="-O3" waf configure' was not detecting dlopen() needs -ldl.
metze
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index 9d0229e..dca6595 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -188,9 +188,11 @@ def CHECK_VARIABLE(conf, v, define=None, always=False,
msg="Checking for variable %s" % v
return CHECK_CODE(conf,
+ # we need to make sure the compiler doesn't
+ # optimize it out...
'''
#ifndef %s
- void *_x; _x=(void *)&%s;
+ void *_x; _x=(void *)&%s; return (int)_x;
#endif
return 0
''' % (v, v),
@@ -264,7 +266,9 @@ def CHECK_FUNC(conf, f, link=True, lib=None, headers=None):
if not ret:
ret = CHECK_CODE(conf,
# it might be a macro
- 'void *__x = (void *)%s' % f,
+ # we need to make sure the compiler doesn't
+ # optimize it out...
+ 'void *__x = (void *)%s; return (int)__x' % f,
execute=False,
link=True,
addmain=True,
--
Samba Shared Repository
