diff options
| author | Will Dietz <github@wdtz.org> | 2018-04-26 08:46:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 08:46:49 -0500 |
| commit | bdf390f9959d64de5300d9d3a2bf1625c0ba4c1f (patch) | |
| tree | d7bab59309f7776e8a90d45b2359063218d53244 | |
| parent | 8460769e88eb2807ecfc89ffc67ed9857a2ebe4e (diff) | |
| parent | b11f3bc8e33232f0adbf3489ceae1b739b8699ba (diff) | |
| download | nixlib-bdf390f9959d64de5300d9d3a2bf1625c0ba4c1f.tar nixlib-bdf390f9959d64de5300d9d3a2bf1625c0ba4c1f.tar.gz nixlib-bdf390f9959d64de5300d9d3a2bf1625c0ba4c1f.tar.bz2 nixlib-bdf390f9959d64de5300d9d3a2bf1625c0ba4c1f.tar.lz nixlib-bdf390f9959d64de5300d9d3a2bf1625c0ba4c1f.tar.xz nixlib-bdf390f9959d64de5300d9d3a2bf1625c0ba4c1f.tar.zst nixlib-bdf390f9959d64de5300d9d3a2bf1625c0ba4c1f.zip | |
Merge pull request #39517 from dtzWill/fix/python3.x-musl-lchmod
cpython: don't use lchmod() on Linux, fix w/musl
4 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5c12d7cec55c..9d89e96383f5 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -140,7 +140,10 @@ let "ac_cv_computed_gotos=yes" "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=yes" - ]; + ] + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no"; postConfigure = if hostPlatform.isCygwin then '' sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 0946f8743fbe..85c45a9d396f 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -96,7 +96,10 @@ in stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" - ]; + ] + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 22c55d302625..d67cc7286942 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -90,7 +90,10 @@ in stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" - ]; + ] + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 950a165a2f4a..ee9a0df9a8c4 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -113,7 +113,10 @@ in stdenv.mkDerivation { "ac_cv_computed_gotos=yes" "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=yes" - ]; + ] + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity |