tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
python.pkgs.numpy: fix patch
authored by
Dmitry Kalinkin
and committed by
vbgl
4d3c3961
5d366182
+13
-5
+13
-5
pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
+13
-5
pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
···
1
1
diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
2
-
index a92ccd3..9630e91 100644
2
+
index 6ed5eec..82a88b5 100644
3
3
--- a/numpy/distutils/unixccompiler.py
4
4
+++ b/numpy/distutils/unixccompiler.py
5
-
@@ -43,10 +43,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
5
+
@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
6
6
if opt not in llink_s:
7
7
self.linker_so = llink_s.split() + opt.split()
8
8
9
9
- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
10
+
-
11
+
# gcc style automatic dependencies, outputs a makefile (-MF) that lists
12
+
# all headers needed by a c file as a side effect of compilation (-MMD)
13
+
if getattr(self, '_auto_depends', False):
14
+
@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
15
+
deps = []
16
+
10
17
try:
11
-
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
18
+
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
12
19
- extra_postargs, display = display)
13
20
+ if self.detect_language(src) == 'c++':
14
21
+ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src)
15
-
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
22
+
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps +
16
23
+ extra_postargs, display = display)
17
24
+ else:
18
25
+ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
19
-
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
26
+
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
20
27
+ extra_postargs, display = display)
28
+
+
21
29
except DistutilsExecError:
22
30
msg = str(get_exception())
23
31
raise CompileError(msg)