The branch, master has been updated
via 69ce298... build: more dependencies on /usr/bin/perl -> ${PERL}
from 3ca5fd8... build: cope with perl not being in /usr/bin/perl
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 69ce29826cf209d79b4aa63e6d1f30ccf7bfd7ae
Author: Andrew Tridgell <[email protected]>
Date: Sun Apr 18 22:57:59 2010 +1000
build: more dependencies on /usr/bin/perl -> ${PERL}
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoproto.py | 2 +-
buildtools/wafsamba/samba_pidl.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoproto.py
b/buildtools/wafsamba/samba_autoproto.py
index edabc7e..b9c6380 100644
--- a/buildtools/wafsamba/samba_autoproto.py
+++ b/buildtools/wafsamba/samba_autoproto.py
@@ -39,7 +39,7 @@ def SAMBA_AUTOPROTO(bld, header, source):
on_results=True,
ext_out='.c',
before ='cc',
- rule = '${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')
Build.BuildContext.SAMBA_AUTOPROTO = SAMBA_AUTOPROTO
diff --git a/buildtools/wafsamba/samba_pidl.py
b/buildtools/wafsamba/samba_pidl.py
index 00098de..bd8324f 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -125,7 +125,7 @@ def SAMBA_PIDL_TABLES(bld, name, target):
bld.SET_BUILD_GROUP('main')
t = bld(
features = 'collect',
- rule = '${SRC} --output ${TGT} | sed "s|default/||" > ${TGT}',
+ rule = '${PERL} ${SRC} --output ${TGT} | sed "s|default/||" >
${TGT}',
ext_out = '.c',
before = 'cc',
on_results = True,
--
Samba Shared Repository
