summaryrefslogtreecommitdiff
path: root/buildtools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* wafsamba: remove tru64cc.py as it's not compatible with waf 2Stefan Metzmacher2018-09-102-78/+0
| | | | | | | | | | | | | | third_party/waf/waflib/Tools/compiler_c.py proposed gcc for osf1V/Tru64. If there's more needed on Tru64 someone with a Tru64 box needs to provide a waf 2 compatible fix. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Mon Sep 10 22:49:31 CEST 2018 on sn-devel-144
* wafsamba: remove hpuxcc.py as it's not compatible with waf 2Stefan Metzmacher2018-09-102-57/+0
| | | | | | | | | | | third_party/waf/waflib/Tools/compiler_c.py proposed gcc for HPUX. If there's more needed on HPUX someone with a HPUX box needs to provide a waf 2 compatible fix. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: remove irixcc.py as we don't support IRIX any moreStefan Metzmacher2018-09-102-80/+0
| | | | | | | There's still a irixcc.py in waf itself. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: fix generic_cc.py to work with waf 2Stefan Metzmacher2018-09-102-54/+49
| | | | | Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: undefine a define for a failed test unless asked to keep itAlexander Bokovoy2018-09-101-0/+2
| | | | | | | | | | | | If conf.CHECK_CODE() is called without `always=True` and the test has failed, undefine the define already set to '0' by conf.check_code(). This restores expectations that undefined symbols are not considered to be set by CONFIG_SET() method. Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* Revert "wafsamba/samba_autoconf: when setting undefined result, use empty tuple"Stefan Metzmacher2018-09-101-5/+1
| | | | | | | | | This reverts commit 95ba6b97441b75f28aef5ec1ee5a9442683f3763. There was already a better fix under discusion. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba/samba_autoconf: when setting undefined result, use empty tupleAlexander Bokovoy2018-09-081-1/+5
| | | | | | | | | | | A difference between waf 1.x and 2.x is that we gained 0 as an undefined variable in the cache file. This does not allow to differentiate unset and set to 0 defines. Force to use empty tuple () to signify unset defines. Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: Fix 'make -j<jobs>'Andreas Schneider2018-09-071-2/+7
| | | | | | | | | | | | | Currently only 'make -j' enables parallel builds and e.g. 'make -j4' results in no parallel compile jobs at all. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13606 Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Fri Sep 7 20:24:46 CEST 2018 on sn-devel-144
* wafsamba/samba_waf18: redefine flex functionAlexander Bokovoy2018-09-071-3/+30
| | | | | | | | | | | | | | | | | | | | There is a bug in waf: flex routine adjusts its inputs against the task's current working directory but assumes it is being called from within the build variant directory. For Samba this means we adjust one level up than the actual work directory we use to run (bin/ vs bin/default) and flex doesn't find the source files. Fix the issue by creating a local override of flex definition that utilizes the same workd directory for both path adjustment and running the flex itself. Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Fri Sep 7 15:45:36 CEST 2018 on sn-devel-144
* wafsamba/samba_autoconf: when setting undefined result, use empty tupleAlexander Bokovoy2018-09-072-6/+13
| | | | | | | | | | | | | | | | | A difference between waf 1.x and 2.x is that we gained 0 as an undefined variable in the cache file. This does not allow to differentiate unset and set to 0 defines. Force to use empty tuple () to signify unset defines. Also, fix handling of extra cflags in case of 'strict=True': if extra_cflags were not defined, we'd append None to the cflags list and it confuses conf.check() later. 'None' is added to the command line of a tool executed by the conf.check() which, depending on a tool, may be treated as an error and cause wrong test result. Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: Support clang as C compilerAndreas Schneider2018-09-061-1/+2
| | | | | | | | Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Martin Schwenke <martin@meltin.net> Autobuild-User(master): Martin Schwenke <martins@samba.org> Autobuild-Date(master): Thu Sep 6 12:06:05 CEST 2018 on sn-devel-144
* buildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded nameAlexander Bokovoy2018-09-051-1/+2
| | | | | | | | | | waflib.Build provides CACHE_SUFFIX constant to append to the target name. We have a reference to samba-specific cache suffix (.cache.py) while original WAF uses _cache.py as a cache suffix since 2011 (see commit 44a967e326cc2e670a31b3712e4763b72d65e81b in WAF project code). Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: remove ENFORCE_GROUP_ORDERINGAlexander Bokovoy2018-09-051-45/+0
| | | | | | | ENFORCE_GROUP_ORDERING is not needed with waf 2.0 anymore Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: port stale_files to waf 2.0Alexander Bokovoy2018-09-051-1/+3
| | | | | Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: generate build options output with waf 2.0Alexander Bokovoy2018-09-051-2/+9
| | | | | | | | | | | | With WAF 2.0 we get all defines in environment at the same level. Fix build options source code generator to handle this. I felt uneasy at filtering out some defines so instead the code is mangling generic defines to be correct for C compiler by replacing '-', '.', and '()' with an underscore ('_'). Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* wafsamba: install Python modules back to bin/python, not bin/python_modulesAlexander Bokovoy2018-09-052-2/+2
| | | | | | | | | | | Partially revert 80fce353e740c793619005ac102ab07fb5e7d280 which started installing generated Python modules into python_modules directory back in 2013. This, unfortunately, does not work anymore as Python gets quite confused with our setup even when both bin/python and bin/python_modules directories are part of sys.path. Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: use cflags instead of ccflags for waf 2.0Alexander Bokovoy2018-09-051-3/+3
| | | | | Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
* buildtools/wafsamba: use context instead of options for cross-compile checks ↵Alexander Bokovoy2018-09-051-2/+2
| | | | | | | for waf 2.0 Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
View Lorry Controller Status