diff mbox

openssl: fix bug #6770

Message ID 1389309614-17911-1-git-send-email-gustavo@zacarias.com.ar
State Accepted
Commit e85696b9bf8733a94e9a9548c930ab15c38bef5a
Headers show

Commit Message

Gustavo Zacarias Jan. 9, 2014, 11:20 p.m. UTC
openssl 1.0.1f Makefile.org doesn't quote $(CC) when passing the
parameter in another invocation of make, hence breaking when the
compiler string contains a space with multiple strings (for example with
ccache).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/openssl/openssl-003-quote-cc.patch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/openssl/openssl-003-quote-cc.patch

Comments

Peter Korsgaard Jan. 10, 2014, 2:43 p.m. UTC | #1
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 > openssl 1.0.1f Makefile.org doesn't quote $(CC) when passing the
 > parameter in another invocation of make, hence breaking when the
 > compiler string contains a space with multiple strings (for example with
 > ccache).

 > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed, thanks.
Arnout Vandecappelle Jan. 14, 2014, 6:48 a.m. UTC | #2
On 10/01/14 00:20, Gustavo Zacarias wrote:
> openssl 1.0.1f Makefile.org doesn't quote $(CC) when passing the
> parameter in another invocation of make, hence breaking when the
> compiler string contains a space with multiple strings (for example with
> ccache).

  It would be nice if the autobuilders would capture this issue. E.g. by 
enabling ccache 50% of the time (and clearing the cache every time, 
because we know it doesn't work correctly and because failures would be 
impossible to reproduce).

  Regards,
  Arnout

>
> Signed-off-by: Gustavo Zacarias<gustavo@zacarias.com.ar>
Matt Weber Jan. 14, 2014, 2:13 p.m. UTC | #3
buildroot-bounces@busybox.net wrote on 01/14/2014 12:48:34 AM:

> From: Arnout Vandecappelle <arnout@mind.be>
> To: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, 
> buildroot@busybox.net, Peter Korsgaard <jacmet@uclibc.org>
> Date: 01/14/2014 01:49 AM
> Subject: Re: [Buildroot] [PATCH] openssl: fix bug #6770
> Sent by: buildroot-bounces@busybox.net
> 
> On 10/01/14 00:20, Gustavo Zacarias wrote:
> > openssl 1.0.1f Makefile.org doesn't quote $(CC) when passing the
> > parameter in another invocation of make, hence breaking when the
> > compiler string contains a space with multiple strings (for example 
with
> > ccache).
> 
>   It would be nice if the autobuilders would capture this issue. E.g. by 

> enabling ccache 50% of the time (and clearing the cache every time, 
> because we know it doesn't work correctly and because failures would be 
> impossible to reproduce).

Until they can, I'll keep posting bugs from my internal builder that does
verification builds across (arm/PPC/x86) architectures and has ccache 
enabled.
I won't catch all package configurations, but would cover most of the 
commonly
used packages. 

Matt
mlweber1@rockwellcollins.com

> 
>   Regards,
>   Arnout
> 
> >
> > Signed-off-by: Gustavo Zacarias<gustavo@zacarias.com.ar>
> 
> 
> -- 
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox

Patch

diff --git a/package/openssl/openssl-003-quote-cc.patch b/package/openssl/openssl-003-quote-cc.patch
new file mode 100644
index 0000000..2c035d9
--- /dev/null
+++ b/package/openssl/openssl-003-quote-cc.patch
@@ -0,0 +1,21 @@ 
+From 9aef04d9baa0a4bb5b8db92e9ab93b0a857a7659 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Thu, 9 Jan 2014 20:08:04 -0300
+Subject: [PATCH] Makefile.org: enclose CC parameter passing in quotes
+
+The compiler invocation might contain a space like when using ccache.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura openssl-1.0.1f.orig/Makefile.org openssl-1.0.1f/Makefile.org
+--- openssl-1.0.1f.orig/Makefile.org	2014-01-09 19:57:23.324040960 -0300
++++ openssl-1.0.1f/Makefile.org	2014-01-09 20:11:23.821070726 -0300
+@@ -302,7 +302,7 @@
+ 			FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
+ 			export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
+ 		fi; \
+-		$(MAKE) -e SHLIBDIRS=crypto  CC=$${CC:-$(CC)} build-shared; \
++		$(MAKE) -e SHLIBDIRS=crypto  CC="$${CC:-$(CC)}" build-shared; \
+ 		touch -c fips_premain_dso$(EXE_EXT); \
+ 	else \
+ 		echo "There's no support for shared libraries on this platform" >&2; \