diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2016-12-23 01:04:35 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-01-19 09:26:15 +0100 |
commit | 9beb04e98d9a6b2dfe95966e2768f886b4092e27 (patch) | |
tree | cce324f66669a11d26f729facb486162b828916b /meta-networking/recipes-connectivity/samba | |
parent | cc32689a5b55843eeaecda173933fd5f281ec3ff (diff) | |
download | meta-openembedded-9beb04e98d9a6b2dfe95966e2768f886b4092e27.tar.gz |
waf-samba.bbclass: fix build error with PARALLEL_MAKE="-j X -l Y"
Waf doesn't handle -l. Use a function already provided by waf.bbclass
in OE-Core. Inheriting waf.bbclass also makes overriding DISABLE_STATIC
redundant, so drop it from recipes inheriting waf-samba.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/samba')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index a199018c9..0ba59c7d3 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | |||
@@ -94,7 +94,6 @@ EXTRA_OECONF += "--enable-fhs \ | |||
94 | --with-libiconv=${STAGING_DIR_HOST}${prefix} \ | 94 | --with-libiconv=${STAGING_DIR_HOST}${prefix} \ |
95 | --with-pam --with-pammodulesdir=${base_libdir}/security \ | 95 | --with-pam --with-pammodulesdir=${base_libdir}/security \ |
96 | " | 96 | " |
97 | DISABLE_STATIC = "" | ||
98 | 97 | ||
99 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 98 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
100 | 99 | ||