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

numpy: fix distutils patch for 1.19.0

Browse Source
This commit is contained in:
Dmitry Kalinkin 2020-07-02 20:23:36 -04:00 committed by Frederik Rietdijk
parent e1206a2129
commit 721d0c43af
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
View File

@ -1,8 +1,7 @@
diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
index 6ed5eec..82a88b5 100644
--- a/numpy/distutils/unixccompiler.py --- a/numpy/distutils/unixccompiler.py
+++ b/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py
@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts @@ -37,8 +37,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
if opt not in llink_s: if opt not in llink_s:
self.linker_so = llink_s.split() + opt.split() self.linker_so = llink_s.split() + opt.split()
@ -11,7 +10,7 @@ index 6ed5eec..82a88b5 100644
# gcc style automatic dependencies, outputs a makefile (-MF) that lists # gcc style automatic dependencies, outputs a makefile (-MF) that lists
# all headers needed by a c file as a side effect of compilation (-MMD) # all headers needed by a c file as a side effect of compilation (-MMD)
if getattr(self, '_auto_depends', False): if getattr(self, '_auto_depends', False):
@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts @@ -47,8 +45,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
deps = [] deps = []
try: try:
@ -26,6 +25,6 @@ index 6ed5eec..82a88b5 100644
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + + self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
+ extra_postargs, display = display) + extra_postargs, display = display)
+ +
except DistutilsExecError: except DistutilsExecError as e:
msg = str(get_exception()) msg = str(e)
raise CompileError(msg) raise CompileError(msg)