From: Andrew Bartlett Date: Mon, 20 Feb 2012 00:26:15 +0000 (+1100) Subject: build: Add libbsd as a dep for LIBREPLACE_HOSTCC X-Git-Tag: samba-4.0.0alpha18~69 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cd7fdab62e2a99a1068f9e8f5a09e0345b4cc90;p=thirdparty%2Fsamba.git build: Add libbsd as a dep for LIBREPLACE_HOSTCC Autobuild-User: Andrew Bartlett Autobuild-Date: Mon Feb 20 02:58:20 CET 2012 on sn-devel-104 --- diff --git a/lib/replace/wscript b/lib/replace/wscript index 5bafc1fe9f7..36c2f0f3e1e 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -428,12 +428,16 @@ def build(bld): REPLACE_HOSTCC_SOURCE += ' %s' % filename break + extra_libs = '' + if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd' + bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC', REPLACE_HOSTCC_SOURCE, use_hostcc=True, use_global_deps=False, cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -DUID_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_', - group='compiler_libraries' + group='compiler_libraries', + deps = extra_libs ) REPLACE_SOURCE = REPLACE_HOSTCC_SOURCE @@ -452,9 +456,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' - extra_libs = '' - if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd' - bld.SAMBA_LIBRARY('replace', source=REPLACE_SOURCE, group='base_libraries',