2017-09-19 00:34:41 +02:00
|
|
|
From 9e95f88906f850caa789977dab4b0f256b575254 Mon Sep 17 00:00:00 2001
|
python3: make readline, gzip, bzip2 and xz really optional
The BR2_PACKAGE_PYTHON3_{READLINE,ZLIB,BZIP2,XZ} options were so far
only bringing in the necessary dependencies, relying on the Python
build system to automatically detect them.
However, this means that even if one of those option was disabled, if
their dependency was found, Python would build the corresponding module,
which is really not what the user would expect.
For example, if you have:
BR2_PACKAGE_READLINE=y
# BR2_PACKAGE_PYTHON3_READLINE is not set
Then you would still get the readline Python module built and installed.
This commit fixes that by adding new --{enable,disable} options, and use
them in python3.mk.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-08 00:00:31 +01:00
|
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
|
Date: Tue, 7 Mar 2017 23:31:11 +0100
|
|
|
|
|
Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
|
---
|
|
|
|
|
configure.ac | 18 ++++++++++++++++++
|
|
|
|
|
1 file changed, 18 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
2017-09-19 00:34:41 +02:00
|
|
|
index 484f6ebaca..79538df0cf 100644
|
python3: make readline, gzip, bzip2 and xz really optional
The BR2_PACKAGE_PYTHON3_{READLINE,ZLIB,BZIP2,XZ} options were so far
only bringing in the necessary dependencies, relying on the Python
build system to automatically detect them.
However, this means that even if one of those option was disabled, if
their dependency was found, Python would build the corresponding module,
which is really not what the user would expect.
For example, if you have:
BR2_PACKAGE_READLINE=y
# BR2_PACKAGE_PYTHON3_READLINE is not set
Then you would still get the readline Python module built and installed.
This commit fixes that by adding new --{enable,disable} options, and use
them in python3.mk.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-08 00:00:31 +01:00
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
2017-09-19 00:34:41 +02:00
|
|
|
@@ -3172,6 +3172,24 @@ AC_ARG_ENABLE(readline,
|
python3: make readline, gzip, bzip2 and xz really optional
The BR2_PACKAGE_PYTHON3_{READLINE,ZLIB,BZIP2,XZ} options were so far
only bringing in the necessary dependencies, relying on the Python
build system to automatically detect them.
However, this means that even if one of those option was disabled, if
their dependency was found, Python would build the corresponding module,
which is really not what the user would expect.
For example, if you have:
BR2_PACKAGE_READLINE=y
# BR2_PACKAGE_PYTHON3_READLINE is not set
Then you would still get the readline Python module built and installed.
This commit fixes that by adding new --{enable,disable} options, and use
them in python3.mk.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-08 00:00:31 +01:00
|
|
|
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
|
|
|
|
|
fi])
|
|
|
|
|
|
|
|
|
|
+AC_ARG_ENABLE(bzip2,
|
|
|
|
|
+ AS_HELP_STRING([--disable-bzip2], [disable bzip2]),
|
|
|
|
|
+ [ if test "$enableval" = "no"; then
|
|
|
|
|
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bz2"
|
|
|
|
|
+ fi])
|
|
|
|
|
+
|
|
|
|
|
+AC_ARG_ENABLE(zlib,
|
|
|
|
|
+ AS_HELP_STRING([--disable-zlib], [disable zlib]),
|
|
|
|
|
+ [ if test "$enableval" = "no"; then
|
|
|
|
|
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib"
|
|
|
|
|
+ fi])
|
|
|
|
|
+
|
|
|
|
|
+AC_ARG_ENABLE(xz,
|
|
|
|
|
+ AS_HELP_STRING([--disable-xz], [disable xz]),
|
|
|
|
|
+ [ if test "$enableval" = "no"; then
|
|
|
|
|
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _lzma"
|
|
|
|
|
+ fi])
|
|
|
|
|
+
|
|
|
|
|
AC_SUBST(TK)
|
|
|
|
|
AC_ARG_ENABLE(tk,
|
|
|
|
|
AS_HELP_STRING([--disable-tk], [disable tk]),
|
|
|
|
|
--
|
2017-09-19 00:34:41 +02:00
|
|
|
2.13.5
|
python3: make readline, gzip, bzip2 and xz really optional
The BR2_PACKAGE_PYTHON3_{READLINE,ZLIB,BZIP2,XZ} options were so far
only bringing in the necessary dependencies, relying on the Python
build system to automatically detect them.
However, this means that even if one of those option was disabled, if
their dependency was found, Python would build the corresponding module,
which is really not what the user would expect.
For example, if you have:
BR2_PACKAGE_READLINE=y
# BR2_PACKAGE_PYTHON3_READLINE is not set
Then you would still get the readline Python module built and installed.
This commit fixes that by adding new --{enable,disable} options, and use
them in python3.mk.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-08 00:00:31 +01:00
|
|
|
|
