From 233bed607ae59f85db7592729e0e5fd3206a9ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
Date: Mon, 11 Feb 2019 10:03:00 +0100
Subject: [PATCH 1/2] waf: print the library name in which we search for a
function
Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 7058a88cbe3c1a2ad272b6debc1c9d09a259d116)
---
buildtools/wafsamba/samba_autoconf.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 6208e3b0439..a39d6ef06d1 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -251,7 +251,10 @@ def CHECK_FUNC(conf, f, link=True, lib=None, headers=None):
ret = False
- conf.COMPOUND_START('Checking for %s' % f)
+ in_lib_str = ""
+ if lib:
+ in_lib_str = " in %s" % lib
+ conf.COMPOUND_START('Checking for %s%s' % (f, in_lib_str))
if link is None or link:
ret = CHECK_CODE(conf,
--
2.23.0
From 8ee1eed377186628675ff1590bc69175ed5def48 Mon Sep 17 00:00:00 2001
From: Christof Schmitt <cs@samba.org>
Date: Wed, 24 Apr 2019 10:16:30 -0700
Subject: [PATCH 2/2] wscript: Remove checks for shm_open and shmget
Commit 74a16a1094278 "s3:smbprofile: Replace sysv shmem with tdb"
removed the usage of the shared memory segment for profiling data. As
there are no other users of shared memory segments, remove the configure
check for these functions.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14140
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 94f2ed3eb35b94d5152578dbb6d5ee8f2fa2da69)
---
source3/wscript | 3 ---
1 file changed, 3 deletions(-)
diff --git a/source3/wscript b/source3/wscript
index 5c2ba18f872..9d283e40a40 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -119,8 +119,6 @@ def configure(conf):
conf.CHECK_FUNCS('lutimes futimes utimensat futimens')
conf.CHECK_FUNCS('mlock munlock mlockall munlockall')
conf.CHECK_FUNCS('memalign posix_memalign hstrerror')
- conf.CHECK_FUNCS('shmget')
- conf.CHECK_FUNCS_IN('shm_open', 'rt', checklibc=True)
conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
conf.CHECK_FUNCS_IN('dn_expand', 'inet')
@@ -408,7 +406,6 @@ rdchk _read __read _readdir __readdir
_seekdir __seekdir
select setenv setgidx setgroups setlocale setluid
setmntent setpgid setpriv setsid setuidx
-shmget shm_open
_stat __stat statvfs
strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctl sysctlbyname
__sys_llseek syslog _telldir __telldir timegm
--
2.23.0