summaryrefslogtreecommitdiff
path: root/buildtools
Commit message (Collapse)AuthorAgeFilesLines
* waf: let CHECK_SIZEOF check for 64 bit alsoBjoern Jacke2019-01-021-1/+1
| | | | | | | | | | | | wafsamba: utmp can be 64 bit also (like on AIX) BUG: https://bugzilla.samba.org/show_bug.cgi?id=12017 Signed-off-by: Bjoern Jacke <bj@sernet.de> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Wed Jan 2 14:10:41 CET 2019 on sn-devel-144
* build: Remove --timestamp-dependencies (BROKEN)Andrew Bartlett2018-12-212-22/+0
| | | | | | | | Remove this code marked as broken, we do not need broken configure options making Samba appear to be more complex than it already is. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
* wafsamba: Do not remove BUILTINS as duplicatesAndreas Schneider2018-12-201-0/+5
| | | | | | | | | | | | | | BUILTINS add object files to the target, so we can't remove them as duplicates. The issue e.g happens when tevent wants to link libreplace: 20:04:10 deps removing dups from tevent of type LIBRARY: {'replace'} also in LIBRARY talloc Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: change shebang to python3 in misc dirsJoe Guo2018-12-141-1/+1
| | | | | | | | Signed-off-by: Joe Guo <joeg@catalyst.net.nz> Reviewed-by: Noel Power <npower@samba.org> Autobuild-User(master): Noel Power <npower@samba.org> Autobuild-Date(master): Fri Dec 14 18:00:40 CET 2018 on sn-devel-144
* build: Move python detection back into waf (instead of in configure and ↵Andrew Bartlett2018-12-141-1/+1
| | | | | | | | | | | | | | | | | | | Makefile) This avoids creating a mini-configure in the configure script. Users wishing to use python2 to build need to specify PYTHON= to both ./configure and make After we merged the python3 change, it became clear that relying on systems prefixing the correct python just causes trouble and make debugging harder, so only use $PYTHON for the override, not the default case This essentially reverts a660b7fb8e519bd3be558fd0425bff8f287fca1f but leaves the files more consistent. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Noel Power <npower@samba.org>
* buildtools/wafsamba: Ensure default python picked up is python3Andrew Bartlett2018-12-141-5/+2
| | | | | | | | 1) set the default python searched for samba waf to be python3 2) remove default setting of PYTHON variable if not defined (not needed) Signed-off-by: Noel Power <npower@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: re-write shebang for delivered python scriptsNoel Power2018-12-142-5/+7
| | | | | | | | | | | | | | | | | | | | | Can't see how the orig code would have worked though a) task.env["PYTHON"] is a list b) task.env["PYTHON_SPECIFIED"] can (and is in our case false) looks like it would only be true for python2 but in anycase no harm we always rewrite the shebang So now it works as follows, 1. PYTHON (which is where the shebang is got) is set to python3 by default 2. To override the default you need to set PYTHON (e.g. to build with python2) 3. If you give a full path in PYTHON then shebang is of the format "#!{FULL_PYTHON_INTERPRETER_PATH) 4. If you specify PYTHON=python or PYTHON=python2 etc. shebang format is "#!!/usr/bin/env python", "#!!/usr/bin/env python2" etc. Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: Decode output of cmd_output (which is bytes)Noel Power2018-12-141-1/+1
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: fix pidl dependencies to rebuild on pidl changesStefan Metzmacher2018-12-131-2/+2
| | | | | Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
* selftest: Run waf build --dup-symbol-check under $PYTHONAndrew Bartlett2018-12-131-1/+1
| | | | | | | This would often be python3 in the new build Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Noel Power <npower@samba.org>
* waf-py3: Allow waf build --dup-symbol-check to operate in python3Andrew Bartlett2018-12-131-10/+10
| | | | | | | Use the b prefix on output from subcommands to match bytes with bytes. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Noel Power <npower@samba.org>
* buildtools/wafsamba: Support --extra-python with python2Noel Power2018-12-101-3/+4
| | | | | | | Relax restriction on extra_python version Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba Provide proper pc fileNoel Power2018-12-101-1/+1
| | | | | | | | | To support building by default python3 we need to fix assumption that only extra-python with py3 has valid PYTHON_SO_ABI_FLAG used to create alt name for pc file. Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: Ensure we detect the correct python.Noel Power2018-12-101-1/+3
| | | | | | | | | | | | | | | In order to support a default python3 build we need to ensure we detect python3 if no PYTHON env variable is set up. Currently we detect python with conf.find_program('python', var='PYTHON', mandatory=mandatory) which uses PYTHON as as hint and falls back to the program name 'python' otherwise Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: Decode result of Popen as unicode/stringNoel Power2018-12-101-1/+1
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3 pure build fix some str/bytes wobbliesNoel Power2018-12-101-2/+2
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: add MODE_{744,_777}Stefan Metzmacher2018-12-051-0/+2
| | | | | Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools: remove unused buildtools/bin/waf-1.9Stefan Metzmacher2018-12-051-164/+0
| | | | | Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: Do not always set _FORTIFY_SOURCE=2Andreas Schneider2018-11-281-1/+1
| | | | | | | This requires to be compiled with optimization (-O). Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
* waf: Load the C compiler correctlyAndreas Schneider2018-11-201-1/+1
| | | | | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Tue Nov 20 04:47:24 CET 2018 on sn-devel-144
* wafsamba: simplify SAMBA_PIDL_TABLES() ruleStefan Metzmacher2018-11-201-1/+2
| | | | | | | | | | The builddir is not bin/default/ instead of just bin/, so we don't need to strip 'default/' anymore. And the '--output ${TGT}' part is not really implemented. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: remove unused Build.BuildContext.pre_build overloadStefan Metzmacher2018-11-202-8/+1
| | | | | | | | This is not needed and also fixed the interaction between vim and ':make' Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: remove the need of BuildContext.bdirStefan Metzmacher2018-11-202-3/+2
| | | | | Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: remove hardcoded '..' and '/default/' from SAMBA_PIDL()Stefan Metzmacher2018-11-201-3/+7
| | | | | | | This makes it possible to remove some move waf 1.8 compat code. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: add a fix for broken python threading if just one job is forcedStefan Metzmacher2018-11-203-223/+18
| | | | | | | This fixes random failures during (at least) configure on AIX. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: fix CHECK_MAKEFLAGS() with waf 2.0.8Stefan Metzmacher2018-11-202-11/+19
| | | | | | | | Changing Options.options.jobs in the build() hook is too late in waf 2. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* third_party: Update socket_wrapper to version 1.2.1Andreas Schneider2018-11-151-1/+1
| | | | | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Nov 15 04:50:31 CET 2018 on sn-devel-144
* waflib: fix syntax error in string formatDouglas Bagnall2018-11-011-1/+1
| | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Noel Power <noel.power@suse.com>
* waflib: add necessary importsDouglas Bagnall2018-11-012-1/+2
| | | | | Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Noel Power <noel.power@suse.com>
* third_party: Update nss_wrapper to version 1.1.5Andreas Schneider2018-10-311-1/+1
| | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* PY3: ensure StringIO usage is py2/py3 compatibleNoel Power2018-10-231-1/+1
|
* PY3: relative import fixesNoel Power2018-10-232-3/+3
|
* third_party: Update cmocka to version 1.1.3Andreas Schneider2018-10-031-1/+1
| | | | | | | | | | | * Added function to filter tests (cmocka_set_test_filter) * Fixed fixture error reporting * Some improvement for API documentation -> https://api.cmocka.org/ * Fixed subunit output on failures * Do not abort if a test is skipped Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* third_party: Update pam_wrapper to version 1.0.7Andreas Schneider2018-10-021-1/+1
| | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org>
* buildtools/wafsamba: Finally fix reference to basestring PY3 error.Noel Power2018-09-281-2/+5
| | | | | | | | While a previous attempt squashed the error on the config & make phase, make install threw up this error again. Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: add_manual_dependency needs bytes for valueNoel Power2018-09-271-1/+1
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: fix basestring not defined error in PY3Noel Power2018-09-271-1/+1
| | | | | | | | Test for str first (which exists in py3 & py2) this avoids the undefined runtime error. Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: md5 related functions need to be passed bytesNoel Power2018-09-271-2/+2
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: decode bytes in py3 where strings are neededNoel Power2018-09-273-3/+6
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: fix "TabError: inconsistent use of tabs and spaces"Noel Power2018-09-271-1/+1
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: make sure print stmt is enclosed by '(' & ')'Noel Power2018-09-191-2/+2
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: decode output of cmd_output for easier string manipNoel Power2018-09-161-1/+1
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: bytes.maketrans, string.maketrans is a PY2 only functionNoel Power2018-09-161-1/+1
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: enclose filter with list as len on result of filter failsNoel Power2018-09-161-2/+2
| | | | | | | filter returns an iterator in PY3 (and a list in PY2) Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* py2/py3 enclose map with listNoel Power2018-09-161-1/+1
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* PY3: fix some octal literalsNoel Power2018-09-161-2/+2
| | | | | Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: Only use $DESTDIR in INSTALL_DIR() if it is setMartin Schwenke2018-09-131-2/+3
| | | | | | | | | | | | | | | Otherwise the leading '/' is stripped and directories are created relative to the current directory. This fixes a regression introduced in recent commit 26ea0f58daace4adef7c5bb17f19476083bf3b7b. Reported-by: Ralph Böhme <slow@samba.org> Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Alexander Bokovoy <ab@samba.org> Autobuild-User(master): Martin Schwenke <martins@samba.org> Autobuild-Date(master): Thu Sep 13 09:37:23 CEST 2018 on sn-devel-144
* wafsamba: Drop unused, broken install_dir()Martin Schwenke2018-09-111-17/+0
| | | | | | | | | | This is broken because it doesn't respect $DESTDIR. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Alexander Bokovoy <ab@samba.org> Autobuild-User(master): Alexander Bokovoy <ab@samba.org> Autobuild-Date(master): Tue Sep 11 10:00:05 CEST 2018 on sn-devel-144
* wafsamba: Have INSTALL_DIR() log directory creationMartin Schwenke2018-09-111-0/+1
| | | | | Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Alexander Bokovoy <ab@samba.org>
* wafsamba: Make INSTALL_DIR() respect $DESTDIRMartin Schwenke2018-09-111-1/+2
| | | | | | | | INSTALL_DIR() currently ignores $DESTDIR and just installs directories into the final destination. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Alexander Bokovoy <ab@samba.org>
View Lorry Controller Status