sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

waf: fixed the build with a space in the source directory

Browse Source
This commit is contained in:
Andrew Tridgell 2010-11-21 23:04:43 +11:00
parent 808edd0293
commit fcdbd06136
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildtools/scripts/abi_gen.sh
View File

@ -10,11 +10,11 @@ cat <<EOF
set height 0 set height 0
set width 0 set width 0
EOF EOF
nm $SHAREDLIB | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | cut -c3- | sort | while read s; do nm "$SHAREDLIB" | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | cut -c3- | sort | while read s; do
echo "echo $s: " echo "echo $s: "
echo p $s echo p $s
done done
) > $GDBSCRIPT ) > $GDBSCRIPT
gdb -batch -x $GDBSCRIPT $SHAREDLIB < /dev/null gdb -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null
rm -f $GDBSCRIPT rm -f $GDBSCRIPT

5
buildtools/wafsamba/samba_autoconf.py
View File

@ -356,8 +356,10 @@ def CHECK_CODE(conf, code, define,
if msg is None: if msg is None:
msg="Checking for %s" % define msg="Checking for %s" % define
cflags = TO_LIST(cflags)
if local_include: if local_include:
cflags += ' -I%s' % conf.curdir cflags.append('-I%s' % conf.curdir)
if not link: if not link:
type='nolink' type='nolink'
@ -368,7 +370,6 @@ def CHECK_CODE(conf, code, define,
(ccflags, ldflags) = library_flags(conf, uselib) (ccflags, ldflags) = library_flags(conf, uselib)
cflags = TO_LIST(cflags)
cflags.extend(ccflags) cflags.extend(ccflags)
if on_target: if on_target:

2
buildtools/wafsamba/samba_autoproto.py
View File

@ -16,7 +16,7 @@ def SAMBA_AUTOPROTO(bld, header, source):
on_results=True, on_results=True,
ext_out='.c', ext_out='.c',
before ='cc', before ='cc',
rule = '${PERL} ${SCRIPT}/mkproto.pl --srcdir=.. --builddir=. --public=/dev/null --private=${TGT} ${SRC}' rule = '${PERL} "${SCRIPT}/mkproto.pl" --srcdir=.. --builddir=. --public=/dev/null --private="${TGT}" ${SRC}'
) )
t.env.SCRIPT = os.path.join(bld.srcnode.abspath(), 'source4/script') t.env.SCRIPT = os.path.join(bld.srcnode.abspath(), 'source4/script')
Build.BuildContext.SAMBA_AUTOPROTO = SAMBA_AUTOPROTO Build.BuildContext.SAMBA_AUTOPROTO = SAMBA_AUTOPROTO

2
buildtools/wafsamba/samba_pidl.py
View File

@ -58,7 +58,7 @@ def SAMBA_PIDL(bld, pname, source,
pidl_src_nodes = bld.pidl_files_cache pidl_src_nodes = bld.pidl_files_cache
# the cd .. is needed because pidl currently is sensitive to the directory it is run in # the cd .. is needed because pidl currently is sensitive to the directory it is run in
t = bld(rule='cd .. && ${PERL} ${PIDL} --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- ${SRC[0].abspath(env)}', t = bld(rule='cd .. && ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"',
ext_out = '.c', ext_out = '.c',
before = 'cc', before = 'cc',
on_results = True, on_results = True,

2
buildtools/wafsamba/wafsamba.py
View File

@ -566,7 +566,7 @@ def ENABLE_TIMESTAMP_DEPENDENCIES(conf):
t = Task.simple_task_type('copy_script', 'rm -f ${LINK_TARGET} && ln -s ${SRC[0].abspath(env)} ${LINK_TARGET}', t = Task.simple_task_type('copy_script', 'rm -f "${LINK_TARGET}" && ln -s "${SRC[0].abspath(env)}" ${LINK_TARGET}',
shell=True, color='PINK', ext_in='.bin') shell=True, color='PINK', ext_in='.bin')
t.quiet = True t.quiet = True