diff options
| author | Andreas Schneider <asn@samba.org> | 2019-09-23 16:53:12 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-09-25 15:39:40 +0000 |
| commit | 9499db075b72b147e2ff9bb78e9d5edbaac14e69 (patch) | |
| tree | 1724c517d5116e7150a1a1ec5647991bd3802ab2 /lib/replace | |
| parent | bd0cd8e13234d684da77a65f6fdaea2572625369 (diff) | |
| download | samba-9499db075b72b147e2ff9bb78e9d5edbaac14e69.tar.gz | |
waf:replace: Do not link against libpthread if not necessary
On Linux we should avoid linking everything against libpthread. Symbols
used my most application are provided by glibc and code which deals with
threads has to explicitly link against libpthread. This avoids setting
LDFLAGS=-pthread globally.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14140
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Pair-Programmed-With: Isaac Boukris <iboukris@gmail.com>
Reviewed-by: Matthias Dieter Wallnöfer <mdw@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/wscript | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index 5b5a9ab39c0..93379a7aefe 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -554,6 +554,11 @@ def configure(conf): PTHREAD_LDFLAGS='error' if PTHREAD_LDFLAGS == 'error': + # Check if pthread_attr_init() is provided by libc first! + if conf.CHECK_FUNCS('pthread_attr_init'): + PTHREAD_CFLAGS='-D_REENTRANT' + PTHREAD_LDFLAGS='' + if PTHREAD_LDFLAGS == 'error': if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'): PTHREAD_CFLAGS='-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS' PTHREAD_LDFLAGS='-lpthread' @@ -565,10 +570,7 @@ def configure(conf): if conf.CHECK_FUNCS_IN('pthread_attr_init', 'c_r'): PTHREAD_CFLAGS='-D_THREAD_SAFE -pthread' PTHREAD_LDFLAGS='-pthread' - if PTHREAD_LDFLAGS == 'error': - if conf.CHECK_FUNCS('pthread_attr_init'): - PTHREAD_CFLAGS='-D_REENTRANT' - PTHREAD_LDFLAGS='-lpthread' + # especially for HP-UX, where the CHECK_FUNC macro fails to test for # pthread_attr_init. On pthread_mutex_lock it works there... if PTHREAD_LDFLAGS == 'error': |