All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] python: disable _ssl.c build when --disable-ssl
@ 2017-01-11 21:22 Matt Weber
  2017-01-13  9:31 ` Nicolas Cavallari
  2017-03-09 23:04 ` Thomas Petazzoni
  0 siblings, 2 replies; 5+ messages in thread
From: Matt Weber @ 2017-01-11 21:22 UTC (permalink / raw)
  To: buildroot

From: Adam <adam.allison@rockwellcollins.com>

When --disable-ssl is provided as an option,
prevent the building of _ssl.c.
Without this change, some GCC toolchains fail
to build the _ssl module depending on the
build configuration
(we observed 4.85 worked and 4.9.4).

Signed-off-by: Adam Allison <adam.allison@rockwellcollins.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
---
 package/python/111-optional-ssl.patch | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/package/python/111-optional-ssl.patch b/package/python/111-optional-ssl.patch
index 956d2a0..1584d64 100644
--- a/package/python/111-optional-ssl.patch
+++ b/package/python/111-optional-ssl.patch
@@ -4,7 +4,8 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
 ---
  configure.in |    6 ++++++
- 1 file changed, 6 insertions(+)
+ setup.py     |    4 ++++
+ 2 files changed, 10 insertions(+)
 
 Index: b/configure.ac
 ===================================================================
@@ -23,3 +24,20 @@ Index: b/configure.ac
  AC_ARG_ENABLE(dbm,
  	AS_HELP_STRING([--disable-dbm], [disable DBM]),
  	[ if test "$enableval" = "no"; then
+ 
+Index: b/setup.py
+===================================================================
+--- a/setup.py
++++ b/setup.py
+@@ -806,6 +806,10 @@
+                                       '/usr/contrib/ssl/lib/'
+                                      ] )
+ 
++        if '--disable-ssl' in sysconfig.get_config_var("CONFIG_ARGS"):
++            ssl_incs = None
++            ssl_libs = None
++
+         if (ssl_incs is not None and
+             ssl_libs is not None):
+             exts.append( Extension('_ssl', ['_ssl.c'],
+
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/1] python: disable _ssl.c build when --disable-ssl
  2017-01-11 21:22 [Buildroot] [PATCH 1/1] python: disable _ssl.c build when --disable-ssl Matt Weber
@ 2017-01-13  9:31 ` Nicolas Cavallari
  2017-03-09 23:04 ` Thomas Petazzoni
  1 sibling, 0 replies; 5+ messages in thread
From: Nicolas Cavallari @ 2017-01-13  9:31 UTC (permalink / raw)
  To: buildroot

On 11/01/2017 22:22, Matt Weber wrote:
> From: Adam <adam.allison@rockwellcollins.com>
> 
> When --disable-ssl is provided as an option,
> prevent the building of _ssl.c.
> Without this change, some GCC toolchains fail
> to build the _ssl module depending on the
> build configuration
> (we observed 4.85 worked and 4.9.4).
> 
> Signed-off-by: Adam Allison <adam.allison@rockwellcollins.com>
> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
> ---
>  package/python/111-optional-ssl.patch | 20 +++++++++++++++++++-
>  1 file changed, 19 insertions(+), 1 deletion(-)

I sent a patch doing the same thing, which was marked as superseeded
in patchwork: https://patchwork.ozlabs.org/patch/696139/

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/1] python: disable _ssl.c build when --disable-ssl
  2017-01-11 21:22 [Buildroot] [PATCH 1/1] python: disable _ssl.c build when --disable-ssl Matt Weber
  2017-01-13  9:31 ` Nicolas Cavallari
@ 2017-03-09 23:04 ` Thomas Petazzoni
  2017-03-10 18:15   ` Matthew Weber
  1 sibling, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2017-03-09 23:04 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, 11 Jan 2017 15:22:22 -0600, Matt Weber wrote:
> From: Adam <adam.allison@rockwellcollins.com>
> 
> When --disable-ssl is provided as an option,
> prevent the building of _ssl.c.
> Without this change, some GCC toolchains fail
> to build the _ssl module depending on the
> build configuration
> (we observed 4.85 worked and 4.9.4).
> 
> Signed-off-by: Adam Allison <adam.allison@rockwellcollins.com>
> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>

Thanks for this patch. However I fixed it in a different/simpler way in
commit
https://git.buildroot.org/buildroot/commit/package/python?id=3c98442669f173818a8cce9479ebb0806cb9f8a2

Let me know if that works for you.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/1] python: disable _ssl.c build when --disable-ssl
  2017-03-09 23:04 ` Thomas Petazzoni
@ 2017-03-10 18:15   ` Matthew Weber
       [not found]     ` <CAO1odpw8E=b2eTsVX8vCjhUF_vpg34WJvUxCKGCm+p0OSMsdkw@mail.gmail.com>
  0 siblings, 1 reply; 5+ messages in thread
From: Matthew Weber @ 2017-03-10 18:15 UTC (permalink / raw)
  To: buildroot

Adam


On Mar 9, 2017 5:04 PM, "Thomas Petazzoni" <
thomas.petazzoni@free-electrons.com> wrote:

Hello,

On Wed, 11 Jan 2017 15:22:22 -0600, Matt Weber wrote:
> From: Adam <adam.allison@rockwellcollins.com>
>
> When --disable-ssl is provided as an option,
> prevent the building of _ssl.c.
> Without this change, some GCC toolchains fail
> to build the _ssl module depending on the
> build configuration
> (we observed 4.85 worked and 4.9.4).
>
> Signed-off-by: Adam Allison <adam.allison@rockwellcollins.com>
> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>

Thanks for this patch. However I fixed it in a different/simpler way in
commit
https://git.buildroot.org/buildroot/commit/package/python?id=
3c98442669f173818a8cce9479ebb0806cb9f8a2

Let me know if that works for you.


  Adam, do you have a test you could run?  It looks fine to me but I can't
test.


Best regards,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170310/9309ed6b/attachment.html>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/1] python: disable _ssl.c build when --disable-ssl
       [not found]         ` <CAO1odpzB59BT3cgh3AVznLzcWz+nShYsok1GqEv_SV9N3wXbLA@mail.gmail.com>
@ 2017-03-10 20:30           ` Thomas Petazzoni
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2017-03-10 20:30 UTC (permalink / raw)
  To: buildroot

Hello,

On Fri, 10 Mar 2017 13:36:45 -0600, Adam Allison wrote:
> Ok, I guess my browser took a dump, and send the message early.
> 
> In setup.py, it will pull in hashlib if 'have_any_openssl' and
> 'have_usable_openssl' is true.
> 
> The old patch forced those to be false.
> This one (cleaner), but the setup.py will have to change as well.

Could you explain in more details what Buildroot configuration you're
using, the problem you're seeing, and what you're expecting to see
instead?

Notice that there is a different option for hashlib,
BR2_PACKAGE_PYTHON_HASHLIB, and it was very recently fixed to really
disable hashlib when disabled (commit
https://git.buildroot.org/buildroot/commit/?id=bc3e1fb22ef641916938fff76bef10a1347ef0f7).

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-03-10 20:30 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-11 21:22 [Buildroot] [PATCH 1/1] python: disable _ssl.c build when --disable-ssl Matt Weber
2017-01-13  9:31 ` Nicolas Cavallari
2017-03-09 23:04 ` Thomas Petazzoni
2017-03-10 18:15   ` Matthew Weber
     [not found]     ` <CAO1odpw8E=b2eTsVX8vCjhUF_vpg34WJvUxCKGCm+p0OSMsdkw@mail.gmail.com>
     [not found]       ` <CAO1odpzng87mcYwEFs72B9bRTdLgewtGscH1GsuEAyndOVuntw@mail.gmail.com>
     [not found]         ` <CAO1odpzB59BT3cgh3AVznLzcWz+nShYsok1GqEv_SV9N3wXbLA@mail.gmail.com>
2017-03-10 20:30           ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.