diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-08-31 22:38:29 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-09-18 17:11:49 +0200 |
commit | 4f76d86d998e7a13e7bfa32238bcd217fbc96a42 (patch) | |
tree | 0909a04741c0d7c85568ee71a269d8e0e958576e | |
parent | d0d9ba275a89cf3c71eda822d5ebf30c348ec6c7 (diff) |
python3: do not use hg when available
During the execution of its configure script, Python 3 tries to find an
available "hg" installation, and if available, will try to use it to get
information from the version control system. To do this, it tries to
communicate over the network, potentially over ports that are blocked,
causing the build to halt. This was reported by a user as part of bug
7802.
To solve this, we simply make the Python script use /bin/false as the
"hg" program.
Fixes bug #7802 for the python3 package.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r-- | package/python3/python3.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 34e129756..393b9fb2a 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -41,8 +41,11 @@ HOST_PYTHON3_CONF_OPTS += \ # Make sure that LD_LIBRARY_PATH overrides -rpath. # This is needed because libpython may be installed at the same time that # python is called. +# Make python believe we don't have 'hg', so that it doesn't try to +# communicate over the network during the build. HOST_PYTHON3_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" + LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ + ac_cv_prog_HAS_HG=/bin/false PYTHON3_DEPENDENCIES = host-python3 libffi @@ -110,11 +113,14 @@ else PYTHON3_CONF_OPTS += --disable-ossaudiodev endif +# Make python believe we don't have 'hg', so that it doesn't try to +# communicate over the network during the build. PYTHON3_CONF_ENV += \ ac_cv_have_long_long_format=yes \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes + ac_cv_working_tzset=yes \ + ac_cv_prog_HAS_HG=/bin/false # uClibc is known to have a broken wcsftime() implementation, so tell # Python 3 to fall back to strftime() instead. |