Skip to content
Snippets Groups Projects
Commit f4bc0b9e03a4 authored by Nikolaj Sjujskij's avatar Nikolaj Sjujskij
Browse files

building: build inotify for sys.platform='linux*'

If Python interpreter was built under Linux 3.x kernel, it reports
sys.platform to be 'linux3' (it is fixed for Python 3, but not for 2.x).
This cancels building inotify extension, which was built only for 'linux2'
platform. Improved test checks if sys.platform begins with 'linux', and together
with test for kernel version to be greater than 2.6 it seems to cover all known
cases.
parent 7ce7177e029a
No related branches found
No related tags found
No related merge requests found
......@@ -309,7 +309,7 @@
else:
extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c']))
if sys.platform == 'linux2' and os.uname()[2] > '2.6':
if sys.platform.startswith('linux') and os.uname()[2] > '2.6':
# The inotify extension is only usable with Linux 2.6 kernels.
# You also need a reasonably recent C library.
# In any case, if it fails to build the error will be skipped ('optional').
......
......@@ -443,7 +443,7 @@
if err.args[0] != errno.EPIPE:
raise
if sys.platform == 'linux2':
if sys.platform.startswith('linux'):
import linuxserver as _server
else:
raise ImportError
......
......@@ -366,7 +366,7 @@
extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'],
extra_link_args=osutil_ldflags))
if sys.platform == 'linux2' and os.uname()[2] > '2.6':
if sys.platform.startswith('linux') and os.uname()[2] > '2.6':
# The inotify extension is only usable with Linux 2.6 kernels.
# You also need a reasonably recent C library.
# In any case, if it fails to build the error will be skipped ('optional').
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment