From 3db70133e6c5806569a5f233427f764c2e54e2d2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 10 Jun 2015 14:33:35 +0200 Subject: [PATCH 1/3] lib/replace: add signal related configure checks These should be in a central place available for all lib/replace users instead of having each caller do its own checks. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11326 Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke Reviewed-by: Amitay Isaacs (cherry picked from commit a82acb076e78eb513fb1228595b220f61377e23c) --- lib/replace/wscript | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/replace/wscript b/lib/replace/wscript index 1949448..a594e23 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -135,6 +135,7 @@ def configure(conf): conf.CHECK_TYPE_IN('sa_family_t', 'sys/socket.h') conf.CHECK_TYPE_IN('sig_atomic_t', 'signal.h', define='HAVE_SIG_ATOMIC_T_TYPE') + conf.CHECK_FUNCS('sigsetmask siggetmask sigprocmask sigblock sigaction sigset') conf.CHECK_FUNCS_IN('''inet_ntoa inet_aton inet_ntop inet_pton connect gethostbyname getaddrinfo getnameinfo freeaddrinfo gai_strerror socketpair''', -- 2.1.0 From cbd26e99aceba4465a34eb8a985de4add1537b3a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 10 Jun 2015 14:33:35 +0200 Subject: [PATCH 2/3] lib/util: remove signal related configure checks These are done in lib/replace now. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11326 Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke Reviewed-by: Amitay Isaacs (cherry picked from commit 322f4b76e5cae9f2513ef68d7d86ad19d4a88244) --- lib/util/wscript_configure | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure index 8d8dc87..78e4a8e 100644 --- a/lib/util/wscript_configure +++ b/lib/util/wscript_configure @@ -7,8 +7,6 @@ if Options.options.disable_fault_handling: # backtrace could be in libexecinfo or in libc conf.CHECK_FUNCS_IN('backtrace backtrace_symbols', 'execinfo', checklibc=True, headers='execinfo.h') -conf.CHECK_FUNCS('sigprocmask sigblock sigaction') - conf.CHECK_STRUCTURE_MEMBER('struct statvfs', 'f_frsize', define='HAVE_FRSIZE', headers='sys/statvfs.h') # all the different ways of doing statfs -- 2.1.0 From 766b842dd3fc2bfbf38c3f0cb07dbda5befb51a5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 10 Jun 2015 14:33:35 +0200 Subject: [PATCH 3/3] s3:wscript: remove signal related configure checks These are done in lib/replace now. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11326 Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Wed Jun 10 17:50:41 CEST 2015 on sn-devel-104 (cherry picked from commit a5fd4ca0dbe4f7cbf0d3ead4214af283aabe4790) --- source3/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/wscript b/source3/wscript index bf025fc..a5c8358 100644 --- a/source3/wscript +++ b/source3/wscript @@ -83,7 +83,7 @@ def configure(conf): conf.CHECK_FUNCS('strtol strchr strupr chflags') conf.CHECK_FUNCS('getrlimit fsync fdatasync setpgid') conf.CHECK_FUNCS('setsid glob strpbrk crypt16 getauthuid') - conf.CHECK_FUNCS('sigprocmask sigblock sigaction sigset innetgr') + conf.CHECK_FUNCS('innetgr') conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf') conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups syscall sysconf') conf.CHECK_FUNCS('atexit grantpt posix_openpt fallocate posix_fallocate') @@ -380,7 +380,7 @@ rdchk _read __read _readdir __readdir _seekdir __seekdir select setenv setgidx setgroups setlocale setluid setmntent setpgid setpriv setsid setuidx -shmget shm_open sigaction sigblock sigprocmask sigset +shmget shm_open _stat __stat statvfs strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctl sysctlbyname __sys_llseek syslog _telldir __telldir timegm -- 2.1.0