JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39517 from dtzWill/fix/python3.x-musl-lchmod

Browse Source 
cpython: don't use lchmod() on Linux, fix w/musl
This commit is contained in:
Will Dietz 2018-04-26 08:46:49 -05:00 committed by GitHub
commit bdf390f995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -140,7 +140,10 @@ let
"ac_cv_computed_gotos=yes" "ac_cv_computed_gotos=yes"
"ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptmx=yes"
"ac_cv_file__dev_ptc=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 '' postConfigure = if hostPlatform.isCygwin then ''
sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),'

5
pkgs/development/interpreters/python/cpython/3.4/default.nix
View File

@ -96,7 +96,10 @@ in stdenv.mkDerivation {
"--without-ensurepip" "--without-ensurepip"
"--with-system-expat" "--with-system-expat"
"--with-system-ffi" "--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 = '' preConfigure = ''
for i in /usr /sw /opt /pkg; do # improve purity for i in /usr /sw /opt /pkg; do # improve purity

5
pkgs/development/interpreters/python/cpython/3.5/default.nix
View File

@ -90,7 +90,10 @@ in stdenv.mkDerivation {
"--without-ensurepip" "--without-ensurepip"
"--with-system-expat" "--with-system-expat"
"--with-system-ffi" "--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 = '' preConfigure = ''
for i in /usr /sw /opt /pkg; do # improve purity for i in /usr /sw /opt /pkg; do # improve purity

5
pkgs/development/interpreters/python/cpython/3.6/default.nix
View File

@ -113,7 +113,10 @@ in stdenv.mkDerivation {
"ac_cv_computed_gotos=yes" "ac_cv_computed_gotos=yes"
"ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptmx=yes"
"ac_cv_file__dev_ptc=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 = '' preConfigure = ''
for i in /usr /sw /opt /pkg; do # improve purity for i in /usr /sw /opt /pkg; do # improve purity