summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-12-15 11:21:49 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:19:04 +0000
commit8dde9d4bd4e8a4be8abbe739159159d0412fd79c (patch)
tree6a221c617867e255ecb8de37a836f0ab05af3c27 /meta
parentb0feb20abcaf4cf24353c5db559139df9d167b0c (diff)
downloadpoky-8dde9d4bd4e8a4be8abbe739159159d0412fd79c.tar.gz
openssh: move setting LD to allow for correct override
Using the export LD in the recipe does not allow for secodnary toolchain overriding LD later, by setting it in the do_configure_append the export is used by autotools setting LD based on the env, but would allow for override later. [YOCTO #6997] (From OE-Core rev: 9b37e630f5f6e37e928f825c4f67481cf58c98a1) (From OE-Core rev: 9dd9d23096e73fa7b6f865241cdd9eff77e5b208) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.6p1.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
index e4468c17c3..0b9e0fb0af 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
@@ -50,7 +50,6 @@ inherit autotools-brokensep ptest
50 50
51# LFS support: 51# LFS support:
52CFLAGS += "-D__FILE_OFFSET_BITS=64" 52CFLAGS += "-D__FILE_OFFSET_BITS=64"
53export LD = "${CC}"
54 53
55# login path is hardcoded in sshd 54# login path is hardcoded in sshd
56EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ 55EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
@@ -75,6 +74,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
75EXTRA_OECONF_append_libc-uclibc=" --without-pam" 74EXTRA_OECONF_append_libc-uclibc=" --without-pam"
76 75
77do_configure_prepend () { 76do_configure_prepend () {
77 export LD="${CC}"
78 install -m 0644 ${WORKDIR}/sshd_config ${B}/ 78 install -m 0644 ${WORKDIR}/sshd_config ${B}/
79 install -m 0644 ${WORKDIR}/ssh_config ${B}/ 79 install -m 0644 ${WORKDIR}/ssh_config ${B}/
80 if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then 80 if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then