| Message ID | 1488927631-21945-6-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Mar 8, 2017 at 12:00 AM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Commit fa627738266e ("python3: do not use the system OpenSSL in the host > variant") added a patch that allows to disable building the OpenSSL > related modules in Python, even if OpenSSL is found. > > But in this commit, it was only used to unconditionally disable OpenSSL > support for the host python3. > > This commit extends that to use the --disable-openssl option also for > the target python3, when BR2_PACKAGE_PYTHON3_SSL. This ensures that if > BR2_PACKAGE_PYTHON3_SSL is disabled, but BR2_PACKAGE_OPENSSL is enabled, > we still don't get the OpenSSL modules built, as the user would expect. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> > --- > package/python3/python3.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python3/python3.mk b/package/python3/python3.mk > index 8bfae79..4ca049c 100644 > --- a/package/python3/python3.mk > +++ b/package/python3/python3.mk > @@ -90,6 +90,8 @@ endif > > ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y) > PYTHON3_DEPENDENCIES += openssl > +else > +PYTHON3_CONF_OPTS += --disable-openssl > endif > > ifneq ($(BR2_PACKAGE_PYTHON3_CODECSCJK),y) > -- > 2.7.4 >
diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 8bfae79..4ca049c 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -90,6 +90,8 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y) PYTHON3_DEPENDENCIES += openssl +else +PYTHON3_CONF_OPTS += --disable-openssl endif ifneq ($(BR2_PACKAGE_PYTHON3_CODECSCJK),y)
Commit fa627738266e ("python3: do not use the system OpenSSL in the host variant") added a patch that allows to disable building the OpenSSL related modules in Python, even if OpenSSL is found. But in this commit, it was only used to unconditionally disable OpenSSL support for the host python3. This commit extends that to use the --disable-openssl option also for the target python3, when BR2_PACKAGE_PYTHON3_SSL. This ensures that if BR2_PACKAGE_PYTHON3_SSL is disabled, but BR2_PACKAGE_OPENSSL is enabled, we still don't get the OpenSSL modules built, as the user would expect. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/python3/python3.mk | 2 ++ 1 file changed, 2 insertions(+)