[oe-commits] Dan McGregor : openssh: Fix non-deterministic build behaviour

git at git.openembedded.org git at git.openembedded.org
Sun Feb 8 08:00:50 UTC 2015


Module: openembedded-core.git
Branch: master
Commit: b2cee9b9f08dff41e46e227b1ffa5e46e98faa89
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b2cee9b9f08dff41e46e227b1ffa5e46e98faa89

Author: Dan McGregor <dan.mcgregor at usask.ca>
Date:   Wed Feb  4 10:09:13 2015 -0600

openssh: Fix non-deterministic build behaviour

If maillock.h is found, a dependency on liblockfile will be created.
liblockfile is in meta-oe, so we don't want that in an oe-core recipe.

Signed-off-by: Dan McGregor <dan.mcgregor at usask.ca>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-connectivity/openssh/openssh_6.7p1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-connectivity/openssh/openssh_6.7p1.bb b/meta/recipes-connectivity/openssh/openssh_6.7p1.bb
index dcbc181..a272629 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.7p1.bb
@@ -62,6 +62,9 @@ CACHED_CONFIGUREVARS += "ac_cv_header_bsd_libutil_h=no ac_cv_header_libutil_h=no
 # passwd path is hardcoded in sshd
 CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
 
+# We don't want to depend on libblockfile
+CACHED_CONFIGUREVARS += "ac_cv_header_maillock_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,



More information about the Openembedded-commits mailing list