helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

waf-samba.bbclass: fix build error with PARALLEL_MAKE="-j X -l Y"

Browse Source 
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>
This commit is contained in:
Andreas Oberritter 2016-12-23 01:04:35 +01:00 committed by Martin Jansa
parent cc32689a5b
commit 9beb04e98d
6 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-networking/classes/waf-samba.bbclass
View File

@ -1,7 +1,7 @@
# waf is a build system which is used by samba related project.
# Obtain details from https://wiki.samba.org/index.php/Waf
#
inherit qemu pythonnative
inherit qemu pythonnative waf
DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python"
@ -86,7 +86,7 @@ do_configure() {
}
do_compile () {
python ./buildtools/bin/waf ${PARALLEL_MAKE}
python ./buildtools/bin/waf ${@get_waf_parallel_make(d)}
}
do_install() {

1
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
View File

@ -94,7 +94,6 @@ EXTRA_OECONF += "--enable-fhs \
--with-libiconv=${STAGING_DIR_HOST}${prefix} \
--with-pam --with-pammodulesdir=${base_libdir}/security \
"
DISABLE_STATIC = ""
LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

1
meta-networking/recipes-support/libldb/libldb_1.1.29.bb
View File

@ -44,7 +44,6 @@ EXTRA_OECONF += "--disable-rpath \
--with-privatelibdir=${libdir}/ldb \
--with-libiconv=${STAGING_DIR_HOST}${prefix}\
"
DISABLE_STATIC = ""
PACKAGES += "pyldb pyldb-dbg pyldb-dev"

1
meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb
View File

@ -37,7 +37,6 @@ EXTRA_OECONF += "--disable-rpath \
--disable-silent-rules \
--with-libiconv=${STAGING_DIR_HOST}${prefix}\
"
DISABLE_STATIC = ""
PACKAGES += "pytalloc pytalloc-dbg pytalloc-dev"

1
meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb
View File

@ -33,7 +33,6 @@ EXTRA_OECONF += "--disable-rpath \
--builtin-libraries=replace \
--with-libiconv=${STAGING_DIR_HOST}${prefix}\
"
DISABLE_STATIC = ""
PACKAGES += "tdb-tools python-tdb python-tdb-dbg"

1
meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb
View File

@ -37,7 +37,6 @@ EXTRA_OECONF += "--disable-rpath \
--with-libiconv=${STAGING_DIR_HOST}${prefix}\
--without-gettext \
"
DISABLE_STATIC = ""
PACKAGES += "python-tevent python-tevent-dbg"