[PATCH] openssh: move setting LD to allow for correct override

[PATCH] openssh: move setting LD to allow for correct override

[Saul Wold]

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]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-connectivity/openssh/openssh_6.6p1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
index dbcf414..abc302b 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
 
 # LFS support:
 CFLAGS += "-D__FILE_OFFSET_BITS=64"
-export LD = "${CC}"
 
 # login path is hardcoded in sshd
 EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
@@ -74,6 +73,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
 EXTRA_OECONF_append_libc-uclibc=" --without-pam"
 
 do_configure_prepend () {
+	export LD="${CC}"
 	install -m 0644 ${WORKDIR}/sshd_config ${B}/
 	install -m 0644 ${WORKDIR}/ssh_config ${B}/
 	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
-- 
1.8.3.1

Re: [PATCH] openssh: move setting LD to allow for correct override

[akuster808]

Saul,

is this needed for dizzy too?

- Armin

On 12/15/2014 11:21 AM, Saul Wold wrote:
> 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]
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>   meta/recipes-connectivity/openssh/openssh_6.6p1.bb | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
> index dbcf414..abc302b 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
>
>   # LFS support:
>   CFLAGS += "-D__FILE_OFFSET_BITS=64"
> -export LD = "${CC}"
>
>   # login path is hardcoded in sshd
>   EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
> @@ -74,6 +73,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
>   EXTRA_OECONF_append_libc-uclibc=" --without-pam"
>
>   do_configure_prepend () {
> +	export LD="${CC}"
>   	install -m 0644 ${WORKDIR}/sshd_config ${B}/
>   	install -m 0644 ${WORKDIR}/ssh_config ${B}/
>   	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
>

Re: [PATCH] openssh: move setting LD to allow for correct override

[Saul Wold]

On 12/15/2014 12:37 PM, akuster808 wrote:
> Saul,
>
> is this needed for dizzy too?
>
Yes and daisy, which I will do when this gets merged, I was going to 
wait until it was in head before asking for the backport.

Sau!

> - Armin
>
> On 12/15/2014 11:21 AM, Saul Wold wrote:
>> 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]
>>
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>>   meta/recipes-connectivity/openssh/openssh_6.6p1.bb | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
>> b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
>> index dbcf414..abc302b 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
>>
>>   # LFS support:
>>   CFLAGS += "-D__FILE_OFFSET_BITS=64"
>> -export LD = "${CC}"
>>
>>   # login path is hardcoded in sshd
>>   EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
>> @@ -74,6 +73,7 @@ CACHED_CONFIGUREVARS +=
>> "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
>>   EXTRA_OECONF_append_libc-uclibc=" --without-pam"
>>
>>   do_configure_prepend () {
>> +    export LD="${CC}"
>>       install -m 0644 ${WORKDIR}/sshd_config ${B}/
>>       install -m 0644 ${WORKDIR}/ssh_config ${B}/
>>       if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
>>
>
>