Skip to contentSkip to conversation

Pull request for branch for-2011.02/openssl-fix

GIT PULL New Thomas Petazzoni 2 participants 3 messages Feb 7, 2011

lore
Share & tools
lore
#0 lore raw

The following changes since commit 9f31e2ffa005095206824e08f69da75503e998ab:
Peter Korsgaard (1):
busybox: 1.18.2 fixes for ping, tar and udhcp

are available in the git repository at:

git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.02/openssl-fix

Thomas Petazzoni (1):
openssl: pass LDFLAGS to fix incorrect link

 package/openssh/openssh.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/1 openssl: pass LDFLAGS to fix incorrect link

We already pass the LD variable to openssl in order to use gcc as the driver for the link process, instead of directly using the ld linker. However, we were not passing LDFLAGS so that the compiler flags are passed, which means that with multilib toolchains, the incorrect library variant could be used at link time, leading to invalid binaries (partly ARMv4, partly ARMv5) or broken compilation (when the build took place in soft-float, but the link stage takes place against hard-float libraries).

This fixes a problem reported on IRC by amo-ej1 when compiling ssh on PowerPC e500v2 with a CodeSourcery toolchain ("crtbegin.o uses hard float, sshd uses soft float").

---
 package/openssh/openssh.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/openssh/openssh.mk +1 -1
index 82c64d6..3db7156 100644
@@ -6,7 +6,7 @@
 
 OPENSSH_VERSION = 5.6p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
-OPENSSH_CONF_ENV = LD="$(TARGET_CC)"
+OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \
 		--disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip
 
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 1/1 openssl: pass LDFLAGS to fix incorrect link

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> We already pass the LD variable to openssl in order to use gcc as the Thomas> driver for the link process, instead of directly using the ld Thomas> linker. However, we were not passing LDFLAGS so that the compiler Thomas> flags are passed, which means that with multilib toolchains, the Thomas> incorrect library variant could be used at link time, leading to Thomas> invalid binaries (partly ARMv4, partly ARMv5) or broken compilation Thomas> (when the build took place in soft-float, but the link stage takes Thomas> place against hard-float libraries).

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard