[Git][NTPsec/ntpsec][fixinstall] Removed incorrect dist/site fix

[Ian Bruene]

Ian Bruene pushed to branch fixinstall at NTPsec / ntpsec


Commits:
b7559068 by Ian Bruene at 2017-12-06T08:34:07-06:00
Removed incorrect dist/site fix

- - - - -


1 changed file:

- pylib/wscript


Changes:

=====================================
pylib/wscript
=====================================
--- a/pylib/wscript
+++ b/pylib/wscript
@@ -11,9 +11,9 @@ 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 1
+    # Library directory hack
     # For unknown reasons python libs are getting shunted off where they
-    # should not be on gentoo.
+    # should not be on gentoo. I DO NOT KNOW HOW BRITTLE THIS CODE IS.
     if conf.env.PYTHONDIR.startswith(conf.env.PREFIX) is False:
         splitPoint = conf.env.PYTHONDIR.find("/python")
         tail = conf.env.PYTHONDIR[splitPoint:]
@@ -22,14 +22,6 @@ def configure(conf):
         splitPoint = conf.env.PYTHONARCHDIR.find("/python")
         tail = conf.env.PYTHONARCHDIR[splitPoint:]
         conf.env.PYTHONARCHDIR = conf.env.PREFIX + "lib" + tail
-    # Library directory hack 2, 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):



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/b7559068d533c9b73b5dd8d4c5691005a0f1b787

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/b7559068d533c9b73b5dd8d4c5691005a0f1b787
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20171206/6da5df7b/attachment.html>