From 30d389c2f11695686a72de4bb315b45eaa7564e8 Mon Sep 17 00:00:00 2001 From: Athanasios Oikonomou Date: Thu, 7 Sep 2017 00:16:42 +0300 Subject: vsftpd: link with wrap when tcp-wrappers configured By default we do not build vsftpd with tcp-wrappers, so we should not include lib wrap. Make lib wrap optional depending on tcp-wrappers PACKAGECONFIG. Signed-off-by: Athanasios Oikonomou Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index e524614464..7a20356018 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -37,6 +37,7 @@ PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" +WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" inherit update-rc.d useradd systemd @@ -54,7 +55,7 @@ do_configure() { } do_compile() { - oe_runmake "LIBS=-L${STAGING_LIBDIR} -lcrypt -lcap ${PAMLIB} -lwrap" + oe_runmake "LIBS=-L${STAGING_LIBDIR} -lcrypt -lcap ${PAMLIB} ${WRAPLIB}" } do_install() { -- cgit 1.2.3-korg