diff options
| author |   Jens Rehsack <rehsack@gmail.com> | 2015-11-19 20:46:30 +0100 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-01-04 12:58:10 -0500 |
| commit | 418d59459148621d593054dc397335d24165a655 (patch) | |
| tree | c6eed96590f59a2eea8d8480c708060ba80c696b /meta-networking/recipes-support/libtevent | |
| parent | 60699c92e17ef124307aded87d8e9bfe55460d22 (diff) | |
| download | meta-openembedded-contrib-418d59459148621d593054dc397335d24165a655.tar.gz | |
libtevent: rework dependencies for deterministic build
Since waf configure infrastructure is a body blow compared to reasonable
autoconf script from packager point of view, samba support libs need
feature-disable-patches. This one is for libtevent removing libcap
(introduced by libldap_r) and attr.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/libtevent')
| -rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch | 20 | ||||
| -rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb | 6 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch new file mode 100644 index 0000000000..2fc55239c3 --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch @@ -0,0 +1,20 @@ +--- a/lib/replace/wscript 2015-11-18 15:40:19.000000000 +0100 ++++ b/lib/replace/wscript 2015-11-18 15:48:09.000000000 +0100 +@@ -618,8 +618,6 @@ + if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' + if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' + if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' +- if not bld.CONFIG_SET('HAVE_GETXATTR') or bld.CONFIG_SET('XATTR_ADDITIONAL_OPTIONS'): +- REPLACE_SOURCE += ' xattr.c' + + bld.SAMBA_LIBRARY('replace', + source=REPLACE_SOURCE, +@@ -630,7 +628,7 @@ + # at the moment: + # hide_symbols=bld.BUILTIN_LIBRARY('replace'), + private_library=True, +- deps='crypt dl nsl socket rt attr' + extra_libs) ++ deps='crypt dl nsl socket rt ' + extra_libs) + + bld.SAMBA_SUBSYSTEM('replace-test', + source='''test/testsuite.c test/strptime.c diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb b/meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb index 36ce7d6f77..006b36dd80 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://tevent.samba.org" SECTION = "libs" LICENSE = "LGPLv3+" -DEPENDS += "libtalloc libcap" +DEPENDS += "libbsd libtalloc" RDEPENDS_python-tevent = "python" SRC_URI = "http://samba.org/ftp/tevent/tevent-${PV}.tar.gz" @@ -14,6 +14,10 @@ SRC_URI[sha256sum] = "f2be7463573dab2d8210cb57fe7e7e2aeb323274cbdc865a6e29ddcfb9 inherit waf-samba +PACKAGECONFIG[attr] = ",,attr" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + S = "${WORKDIR}/tevent-${PV}" EXTRA_OECONF += "--disable-rpath \ |