Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Menu
Open sidebar
NTPsec
ntpsec
Commits
f1f98aaa
Commit
f1f98aaa
authored
Dec 03, 2017
by
Ian Bruene
Browse files
Build script switches to site-packages on user install if necessary
This fixes the FHS violation in bug
#414
parent
2052ed6c
Pipeline
#14756559
passed with stages
in 16 minutes and 6 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
pylib/wscript
View file @
f1f98aaa
...
...
@@ -11,6 +11,14 @@ def configure(conf):
fixed.load('python')
fixed.check_python_version((2, 6, 0))
conf.check_python_headers(features='pyext') # Extension-only, no embedded
# Library directory hack, dist-packages is what python reports.
# That is reserved by the FHS, we have to use site-packages for user
# installs. Distribution installs can use dist-packages.
if "/usr/local/" in conf.env.PYTHONDIR:
if "dist-packages" in conf.env.PYTHONDIR:
conf.env.PYTHONDIR = conf.env.PYTHONDIR.replace("dist", "site")
if "dist-packages" in conf.env.PYTHONARCHDIR:
conf.env.PYTHONARCHDIR = conf.env.PYTHONARCHDIR.replace("dist", "site")
def build(ctx):
...
...
Richard Laager
@rlaager
mentioned in issue
#414 (closed)
·
Dec 06, 2017
mentioned in issue
#414 (closed)
mentioned in issue #414
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment