summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2014-03-30 13:48:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-31 17:53:45 +0100
commit103ef2295c728e427acc27bb071e786946c459f2 (patch)
tree62ef6b67a286ba63751a3eab5e2a638eedb6d966
parent25ba4042ae782016aaf1cb5d3dac09b2a1030a1e (diff)
downloadopenembedded-core-contrib-103ef2295c728e427acc27bb071e786946c459f2.tar.gz
openembedded-core-contrib-103ef2295c728e427acc27bb071e786946c459f2.tar.bz2
openembedded-core-contrib-103ef2295c728e427acc27bb071e786946c459f2.zip
openssh: build without libbsd
We do not DEPEND on libbsd, so we do not want to build with it just because libutil.h is found by configure. As noted in the patch, specifying --disable-libutil to configure does not work, so we provide "cached" configure variables. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.5p1.bb6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
index 6c413afd45..3496b4d878 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
@@ -61,6 +61,12 @@ EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--with
--sysconfdir=${sysconfdir}/ssh \
--with-xauth=/usr/bin/xauth"
+# Since we do not depend on libbsd, we do not want configure to use it
+# just because it finds libutil.h. But, specifying --disable-libutil
+# causes compile errors, so...
+#
+CACHED_CONFIGUREVARS += "ac_cv_header_bsd_libutil_h=no ac_cv_header_libutil_h=no"
+
# This is a workaround for uclibc because including stdio.h
# pulls in pthreads.h and causes conflicts in function prototypes.
# This results in compilation failure, so unless this is fixed,