The branch, master has been updated
via 2ba5fb2 autobuild: Test with and without building bundled popt
via 156ac24 popt: Add check for iconv library
via 100fe9e popt: Check for headers only if building in-tree version
from 409d462 selftest: run smbtorture3 SMB2-BASIC tests against
additional shares
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2ba5fb20318580e0dad58357a7c9eb947a42f008
Author: Andrew Bartlett <[email protected]>
Date: Fri Jul 27 15:50:15 2018 +1200
autobuild: Test with and without building bundled popt
Signed-off-by: Andrew Bartlett <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Sat Jul 28 03:39:48 CEST 2018 on sn-devel-144
commit 156ac24453d6f6026757a518941f1df6c44135f8
Author: Amitay Isaacs <[email protected]>
Date: Fri Jul 27 12:52:16 2018 +1000
popt: Add check for iconv library
On glibc based systems, there is no separate iconv library. Adding a
dependency without checking for the library breaks build on glibc based
systems.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
commit 100fe9e9991136143c12abec688c607266eb9f51
Author: Amitay Isaacs <[email protected]>
Date: Fri Jul 27 12:55:47 2018 +1000
popt: Check for headers only if building in-tree version
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
script/autobuild.py | 4 ++--
third_party/popt/wscript | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/script/autobuild.py b/script/autobuild.py
index f8b100e..19a5113 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -81,8 +81,8 @@ samba_libs_envvars =
"PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH"
samba_libs_envvars += "
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig"
samba_libs_envvars += " ADDITIONAL_CFLAGS='-Wmissing-prototypes'"
samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check
--enable-debug --picky-developer -C ${PREFIX}"
-samba_libs_configure_libs = samba_libs_configure_base + "
--bundled-libraries=cmocka,NONE ${EXTRA_PYTHON}"
-samba_libs_configure_bundled_libs = "
--bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent"
+samba_libs_configure_libs = samba_libs_configure_base + "
--bundled-libraries=cmocka,popt,NONE ${EXTRA_PYTHON}"
+samba_libs_configure_bundled_libs = "
--bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent,!popt"
samba_libs_configure_samba = samba_libs_configure_base +
samba_libs_configure_bundled_libs + " ${EXTRA_PYTHON}"
if os.environ.get("AUTOBUILD_NO_EXTRA_PYTHON", "0") == "1":
diff --git a/third_party/popt/wscript b/third_party/popt/wscript
index 135bae8..a613ff6 100644
--- a/third_party/popt/wscript
+++ b/third_party/popt/wscript
@@ -3,11 +3,13 @@
import Options
def configure(conf):
- conf.CHECK_HEADERS('float.h')
- conf.CHECK_FUNCS('stpcpy')
-
if conf.CHECK_POPT():
conf.define('USING_SYSTEM_POPT', 1)
+ return
+
+ conf.CHECK_HEADERS('float.h')
+ conf.CHECK_FUNCS('stpcpy')
+ conf.CHECK_LIB('iconv', shlib=True)
def build(bld):
if bld.CONFIG_SET('USING_SYSTEM_POPT'):
--
Samba Shared Repository
