[PATCH] A couple of fixes from the ChromeOS folks.
Jeremy Allison
jra at samba.org
Mon Apr 22 18:29:49 UTC 2019
They build a minimal Samba and don't want
perl or python modules installed.
RB+ me and both pass gitlab-CI. I've
also created merge requests on gitlab
if you're more comfortable looking at
the changes there.
Cheers,
Jeremy.
-------------- next part --------------
From cc06bd3532e4c52ea65a8734a2802fa5fa13e01d Mon Sep 17 00:00:00 2001
From: Lutz Justen <ljusten at google.com>
Date: Fri, 19 Apr 2019 11:17:58 -0700
Subject: [PATCH 1/2] waf: install: Remove installation of PIDL and manpages.
It's not used outside of Samba other than wireshark
who have their own vendor fork.
Signed-off-by: Lutz Justen <ljusten at google.com>
Signed-off-by: Jeremy Allison <jra at samba.org>
---
pidl/lib/wscript_build | 37 -------------------------------------
pidl/wscript | 38 --------------------------------------
2 files changed, 75 deletions(-)
delete mode 100644 pidl/lib/wscript_build
diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build
deleted file mode 100644
index 54b3170c4e2..00000000000
--- a/pidl/lib/wscript_build
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-
-# install the pidl modules
-bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR,
- '''
- Parse/Pidl.pm
- Parse/Pidl/Samba4.pm
- Parse/Pidl/CUtil.pm
- Parse/Pidl/Expr.pm
- Parse/Pidl/Wireshark/Conformance.pm
- Parse/Pidl/Wireshark/NDR.pm
- Parse/Pidl/ODL.pm
- Parse/Pidl/Dump.pm
- Parse/Pidl/Util.pm
- Parse/Pidl/Samba4/Header.pm
- Parse/Pidl/Samba4/COM/Header.pm
- Parse/Pidl/Samba4/COM/Proxy.pm
- Parse/Pidl/Samba4/COM/Stub.pm
- Parse/Pidl/Samba4/TDR.pm
- Parse/Pidl/Samba4/NDR/Server.pm
- Parse/Pidl/Samba4/NDR/Client.pm
- Parse/Pidl/Samba4/NDR/Parser.pm
- Parse/Pidl/Samba4/Python.pm
- Parse/Pidl/Samba4/Template.pm
- Parse/Pidl/IDL.pm
- Parse/Pidl/Typelist.pm
- Parse/Pidl/Samba3/ClientNDR.pm
- Parse/Pidl/Samba3/ServerNDR.pm
- Parse/Pidl/Compat.pm
- Parse/Pidl/NDR.pm
- ''',
- flat=False)
-
-if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'):
- bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR,
- 'Parse/Yapp/Driver.pm',
- flat=False)
diff --git a/pidl/wscript b/pidl/wscript
index a2a15d36851..01b71bd8b27 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -32,49 +32,11 @@ def configure(conf):
# Check if perl(Parse::Yapp::Driver) is available.
check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05)
- # we need a recent version of MakeMaker to get the right man page names
- if conf.CHECK_PERL_MANPAGE():
- conf.env.PERLMAN1EXT = conf.CHECK_PERL_MANPAGE(section='1')
- conf.env.PERLMAN3EXT = conf.CHECK_PERL_MANPAGE(section='3')
- conf.DEFINE('HAVE_PERL_MAKEMAKER', 1)
-
# yapp is used for building the parser
conf.find_program('yapp', var='YAPP')
conf.find_program('pod2man', var='POD2MAN')
def build(bld):
- bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755, perl_fixup=True)
-
- bld.RECURSE('lib')
-
- if not bld.CONFIG_SET('HAVE_PERL_MAKEMAKER'):
- return
-
- pidl_manpages = {
- 'pidl': 'man1/pidl.${PERLMAN1EXT}',
- 'lib/Parse/Pidl/NDR.pm': 'man3/Parse::Pidl::NDR.${PERLMAN3EXT}',
- 'lib/Parse/Pidl/Wireshark/Conformance.pm': 'man3/Parse::Pidl::Wireshark::Conformance.${PERLMAN3EXT}',
- 'lib/Parse/Pidl/Dump.pm': 'man3/Parse::Pidl::Dump.${PERLMAN3EXT}',
- 'lib/Parse/Pidl/Util.pm': 'man3/Parse::Pidl::Util.${PERLMAN3EXT}',
- 'lib/Parse/Pidl/Wireshark/NDR.pm': 'man3/Parse::Pidl::Wireshark::NDR.${PERLMAN3EXT}'
- }
-
- for k in pidl_manpages.keys():
- pidl_manpages[k] = bld.EXPAND_VARIABLES(pidl_manpages[k])
-
- # use perl to build the manpages
- bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl')
-
- bld.SET_BUILD_GROUP('final')
- if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
- for src in pidl_manpages.keys():
- manpage = pidl_manpages[src]
- section = manpage.rsplit( ".", 1)[1]
- bld(rule='${POD2MAN} -c "Samba Documentation" -s %s ${SRC} ${TGT}' % section,
- shell=True,
- source=src,
- install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
- target=os.path.basename(manpage))
# we want to prefer the git version of the parsers if we can.
# Only if the source has changed do we want to re-run yapp
--
2.21.0.593.g511ec345e18-goog
From 7196e84d36784778b1fb3fd5ecb33ce0da6478f6 Mon Sep 17 00:00:00 2001
From: Lutz Justen <ljusten at google.com>
Date: Mon, 22 Apr 2019 10:22:16 -0700
Subject: [PATCH 2/2] waf: build: Respect --disable-python for third_party
modules
Skips installation of samba/third_party stuff into the python directory if
--disable-python is set.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13905
Signed-off-by: Lutz Justen <ljusten at google.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
---
third_party/wscript | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/third_party/wscript b/third_party/wscript
index ecd1975d7b8..286e1015e70 100644
--- a/third_party/wscript
+++ b/third_party/wscript
@@ -60,23 +60,25 @@ def configure(conf):
def build(bld):
- list = []
+ if not bld.env.disable_python:
+ list = []
- for module, package in external_pkgs.items():
- try:
- __import__(module)
- except ImportError:
- list.append(package)
+ for module, package in external_pkgs.items():
+ try:
+ __import__(module)
+ except ImportError:
+ list.append(package)
+
+ for e in list:
+ bld.INSTALL_WILDCARD('${PYTHONARCHDIR}/samba/third_party', e + '/**/*', flat=False,
+ exclude='*.pyc', trim_path=os.path.dirname(e))
- for e in list:
- bld.INSTALL_WILDCARD('${PYTHONARCHDIR}/samba/third_party', e + '/**/*', flat=False,
- exclude='*.pyc', trim_path=os.path.dirname(e))
+ bld.SAMBA_GENERATOR('third_party_init_py',
+ rule='touch ${TGT}',
+ target='empty_file')
- bld.SAMBA_GENERATOR('third_party_init_py',
- rule='touch ${TGT}',
- target='empty_file')
+ bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/third_party', 'empty_file', destname='__init__.py')
- bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/third_party', 'empty_file', destname='__init__.py')
bld.RECURSE('cmocka')
bld.RECURSE('zlib')
bld.RECURSE('popt')
--
2.21.0.593.g511ec345e18-goog
More information about the samba-technical
mailing list