From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 04/10] openssh: move setting LD to allow for correct override
Date: Thu, 5 Feb 2015 10:39:42 -0800 [thread overview]
Message-ID: <1423161588-6867-5-git-send-email-sgw@linux.intel.com> (raw)
In-Reply-To: <1423161588-6867-1-git-send-email-sgw@linux.intel.com>
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>
Conflicts:
meta/recipes-connectivity/openssh/openssh_6.5p1.bb
---
meta/recipes-connectivity/openssh/openssh_6.5p1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
index cf83fb4..20c0407 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
@@ -54,7 +54,6 @@ inherit autotools-brokensep
# LFS support:
CFLAGS += "-D__FILE_OFFSET_BITS=64"
-export LD = "${CC}"
# login path is hardcoded in sshd
EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
@@ -79,6 +78,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
EXTRA_OECONF_append_libc-uclibc=" --without-pam"
do_configure_prepend () {
+ export LD="${CC}"
if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
cp aclocal.m4 acinclude.m4
fi
--
2.1.0
next prev parent reply other threads:[~2015-02-05 18:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-05 18:39 [PATCH 00/10][daisy] Patches for Daisy Saul Wold
2015-02-05 18:39 ` [PATCH 01/10] cpio: fix bug CVE-2014-9112 for cpio-2.11 Saul Wold
2015-02-05 18:39 ` [PATCH 02/10] cpio: fix bug CVE-2014-9112 for cpio-2.8 Saul Wold
2015-02-05 18:39 ` [PATCH 03/10] resolvconf: add fixes for busybox and make it work Saul Wold
2015-02-05 18:39 ` Saul Wold [this message]
2015-02-05 18:39 ` [PATCH 05/10] systemd: backport patch to fix reading journal backwards Saul Wold
2015-02-05 18:39 ` [PATCH 06/10] python: Disables SSLv3 Saul Wold
2015-02-05 18:39 ` [PATCH 07/10] update-rc.d: Allow to use different initscripts provider Saul Wold
2015-02-05 18:39 ` [PATCH 08/10] file: CVE-2014-9620 and CVE-2014-9621 Saul Wold
2015-02-05 18:39 ` [PATCH 09/10] bind: fix for CVE-2014-8500 Saul Wold
2015-02-05 18:39 ` [PATCH 10/10] btrfs: create an empty file to build the fs in Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423161588-6867-5-git-send-email-sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox