The branch, master has been updated via 59abfcb WAF: Fix detection of IPv6 via be12f82 WAF: Fix detection os sysname ... via f4c0a75 WAF: Fix detection of linker features via b7ae41e lib replace: Fix detection of features from 2487a42 Happy New Year 2017!
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 59abfcb7945103cd4031abac86d51cd51ce052ca Author: Lukas Slebodnik <lsleb...@redhat.com> Date: Tue Dec 6 18:07:50 2016 +0100 WAF: Fix detection of IPv6 Detection of IPv6 failed with strict CFLAGS due to missing header file. Checking for HAVE_IPV6 : not found ../test.c: In function ‘main’: ../test.c:226:34: error: implicit declaration of function ‘if_nametoindex’ [-Werror=implicit-function-declaration] int idx = if_nametoindex("iface1"); ^~~~~~~~~~~~~~ Signed-off-by: Lukas Slebodnik <lsleb...@redhat.com> Reviewed-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Mon Jan 2 18:03:20 CET 2017 on sn-devel-144 commit be12f82cf1ca652b06995e84971c878621315d24 Author: Lukas Slebodnik <lsleb...@redhat.com> Date: Tue Dec 6 18:07:43 2016 +0100 WAF: Fix detection os sysname ... Detection of sysname failed with stricter CFLAGS "-Werrorr=implicit-function-declaration -Werror=implicit-int" Checking uname sysname type : not found Checking uname machine type : not found Checking uname release type : not found Checking uname version type : not found ../test.c: In function ‘main’: ../test.c:8:32: error: implicit declaration of function ‘printf’ [-Werror=implicit-function-declaration] printf("%s", n.sysname); ^~~~~~ ../test.c:8:32: warning: incompatible implicit declaration of built-in function ‘printf’ ../test.c:8:32: note: include ‘<stdio.h>’ or provide a declaration of ‘printf’ Signed-off-by: Lukas Slebodnik <lsleb...@redhat.com> Reviewed-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit f4c0a750d4adebcf2342a44e85f04526c34268c8 Author: Lukas Slebodnik <lsleb...@redhat.com> Date: Tue Dec 6 18:07:36 2016 +0100 WAF: Fix detection of linker features Following check of linker feature failed with strict CFLAGS "-Werrorr=implicit-function-declaration -Werror=implicit-int" Checking for rpath library support : not found Checking for -Wl,--version-script support : not found ../main.c: In function ‘main’: ../main.c:1:26: error: implicit declaration of function ‘lib_func’ [-Werror=implicit-function-declaration] int main(void) {return !(lib_func() == 42);} ^~~~~~~~ Signed-off-by: Lukas Slebodnik <lsleb...@redhat.com> Reviewed-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit b7ae41e6ca133e08f1dc62bd49436f51f490f46b Author: Lukas Slebodnik <lsleb...@redhat.com> Date: Tue Dec 6 18:07:18 2016 +0100 lib replace: Fix detection of features If configure script is executed with stricter cflags "-Werrorr=implicit-function-declaration -Werror=implicit-int" then detection of few features will fail. Checking for C99 vsnprintf : not found Checking for HAVE_SHARED_MMAP : not found Checking for HAVE_MREMAP : not found lib/replace/test/shared_mmap.c:18:1: error: return type defaults to ‘int’ [-Werror=implicit-int] main() ^~~~ lib/replace/test/shared_mmap.c: In function ‘main’: lib/replace/test/shared_mmap.c:25:16: error: implicit declaration of function ‘exit’ [-Werror=implicit-function-declaration] if (fd == -1) exit(1); ^~~~ lib/replace/test/shared_mmap.c:25:16: warning: incompatible implicit declaration of built-in function ‘exit’ lib/replace/test/shared_mmap.c:25:16: note: include ‘<stdlib.h>’ or provide a declaration of ‘exit’ Signed-off-by: Lukas Slebodnik <lsleb...@redhat.com> Reviewed-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/samba_conftests.py | 5 ++++- lib/replace/test/shared_mmap.c | 5 ++++- lib/replace/test/shared_mremap.c | 5 ++++- lib/replace/test/snprintf.c | 2 +- lib/replace/wscript | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py index 045f858..72e4321 100644 --- a/buildtools/wafsamba/samba_conftests.py +++ b/buildtools/wafsamba/samba_conftests.py @@ -286,7 +286,9 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None): os.makedirs(subdir) Utils.writef(os.path.join(subdir, 'lib1.c'), 'int lib_func(void) { return 42; }\n') - Utils.writef(os.path.join(dir, 'main.c'), 'int main(void) {return !(lib_func() == 42);}\n') + Utils.writef(os.path.join(dir, 'main.c'), + 'int lib_func(void);\n' + 'int main(void) {return !(lib_func() == 42);}\n') bld = Build.BuildContext() bld.log = conf.log @@ -436,6 +438,7 @@ def CHECK_UNAME(conf): ret = True for v in "sysname machine release version".split(): if not conf.CHECK_CODE(''' + int printf(const char *format, ...); struct utsname n; if (uname(&n) == -1) return -1; printf("%%s", n.%s); diff --git a/lib/replace/test/shared_mmap.c b/lib/replace/test/shared_mmap.c index 50dad8d..9d6e3fc 100644 --- a/lib/replace/test/shared_mmap.c +++ b/lib/replace/test/shared_mmap.c @@ -4,6 +4,9 @@ #if defined(HAVE_UNISTD_H) #include <unistd.h> #endif +#ifdef HAVE_STDLIB_H +#include <stdlib.h> +#endif #include <sys/mman.h> #include <sys/types.h> #include <sys/stat.h> @@ -15,7 +18,7 @@ #define MAP_FILE 0 #endif -main() +int main(void) { int *buf; int i; diff --git a/lib/replace/test/shared_mremap.c b/lib/replace/test/shared_mremap.c index 05032ad..08040e2 100644 --- a/lib/replace/test/shared_mremap.c +++ b/lib/replace/test/shared_mremap.c @@ -3,6 +3,9 @@ #if defined(HAVE_UNISTD_H) #include <unistd.h> #endif +#ifdef HAVE_STDLIB_H +#include <stdlib.h> +#endif #include <sys/mman.h> #include <sys/types.h> #include <sys/stat.h> @@ -18,7 +21,7 @@ #define MAP_FAILED (int *)-1 #endif -main() +int main(void) { int *buf; int fd; diff --git a/lib/replace/test/snprintf.c b/lib/replace/test/snprintf.c index d06630b..77473f0 100644 --- a/lib/replace/test/snprintf.c +++ b/lib/replace/test/snprintf.c @@ -26,4 +26,4 @@ void foo(const char *format, ...) printf("1"); exit(0); } -main() { foo("hello"); } +int main(void) { foo("hello"); } diff --git a/lib/replace/wscript b/lib/replace/wscript index 1dfd902..ea0d5d0 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -189,7 +189,7 @@ def configure(conf): ''', define='HAVE_IPV6', lib='nsl socket', - headers='sys/socket.h netdb.h netinet/in.h') + headers='sys/socket.h netdb.h netinet/in.h net/if.h') if conf.CONFIG_SET('HAVE_SYS_UCONTEXT_H') and conf.CONFIG_SET('HAVE_SIGNAL_H'): conf.CHECK_CODE(''' -- Samba Shared Repository