summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
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-19 18:07:59 +0000
commitd913c67ef10079c1bf0f7ed998a5a7b36a73ea21 (patch)
treecb1de616fcc3e46d4bf66011b3281e862957c4f9 /meta/recipes-connectivity
parent48a03945c303dcf75230bf88b642ba6433f9a5bd (diff)
downloadpoky-d913c67ef10079c1bf0f7ed998a5a7b36a73ea21.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) 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>
Diffstat (limited to 'meta/recipes-connectivity')
-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 dbcf4146ed..abc302b90f 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
@@ -49,7 +49,6 @@ inherit autotools-brokensep ptest
49 49
50# LFS support: 50# LFS support:
51CFLAGS += "-D__FILE_OFFSET_BITS=64" 51CFLAGS += "-D__FILE_OFFSET_BITS=64"
52export LD = "${CC}"
53 52
54# login path is hardcoded in sshd 53# login path is hardcoded in sshd
55EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ 54EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
@@ -74,6 +73,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
74EXTRA_OECONF_append_libc-uclibc=" --without-pam" 73EXTRA_OECONF_append_libc-uclibc=" --without-pam"
75 74
76do_configure_prepend () { 75do_configure_prepend () {
76 export LD="${CC}"
77 install -m 0644 ${WORKDIR}/sshd_config ${B}/ 77 install -m 0644 ${WORKDIR}/sshd_config ${B}/
78 install -m 0644 ${WORKDIR}/ssh_config ${B}/ 78 install -m 0644 ${WORKDIR}/ssh_config ${B}/
79 if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then 79 if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then