This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12207

zstd: hack include order to ensure that our zstd.h is found
Needs ReviewPublic

Authored by joerg.sonnenberger on Feb 21 2022, 8:45 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

If the regular Python CFLAGS include directories that already have the
zstd headers available, a different and possible incompatible version
can be picked up otherwise. Sadly, it seems like Python has no easy way
to prefix flags before the rest.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg added a subscriber: indygreg.Feb 21 2022, 1:51 PM

Do you think we can do this upstream?

I think the vendored version of python-zstandard can be upgraded to the latest version now that Python 2 support has been dropped. (Although there may be a Python 3.5 support question.)

I'd prefer if we could facilitate this workaround in the upstream project and not require Mercurial to patch python-zstandard's sources.

Revision Contents
Changeset List

Diff 32272

contrib/python-zstandard/setup_zstd.py

if support_legacy: if support_legacy:
sources.update( sources.update(
[os.path.join(actual_root, p) for p in zstd_sources_legacy] [os.path.join(actual_root, p) for p in zstd_sources_legacy]
) )
sources = list(sources) sources = list(sources)
include_dirs = set([os.path.join(actual_root, d) for d in ext_includes]) include_dirs = set([os.path.join(actual_root, d) for d in ext_includes])
if not system_zstd: if not system_zstd:
include_dirs.update( from distutils import sysconfig
[os.path.join(actual_root, d) for d in zstd_includes] try:
) from shlex import quote
except ImportError:
from pipes import quote
includes = []
for incdir in [os.path.join(actual_root, d) for d in zstd_includes]:
includes.append('-I' + quote(incdir))
include_dirs.add(incdir)
config_vars = sysconfig.get_config_vars()
config_vars['CFLAGS'] = ' '.join(includes + [config_vars.get('CFLAGS', '')])
if support_legacy: if support_legacy:
include_dirs.update( include_dirs.update(
[os.path.join(actual_root, d) for d in zstd_includes_legacy] [os.path.join(actual_root, d) for d in zstd_includes_legacy]
) )
include_dirs = list(include_dirs) include_dirs = list(include_dirs)
depends = [os.path.join(actual_root, p) for p in zstd_depends] depends = [os.path.join(actual_root, p) for p in zstd_depends]