diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-08-28 23:41:35 -0400 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2017-08-29 20:22:05 +0200 |
| commit | 4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1 (patch) | |
| tree | a21ee9a1b472812bb7c7018dc049f3950154e82d /pkgs/development/python-modules/numpy | |
| parent | 5d366182490c5b4f3ab8fad2ee8599fb366a8276 (diff) | |
| download | nixpkgs-4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1.tar nixpkgs-4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1.tar.gz nixpkgs-4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1.tar.bz2 nixpkgs-4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1.tar.lz nixpkgs-4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1.tar.xz nixpkgs-4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1.tar.zst nixpkgs-4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1.zip | |
python.pkgs.numpy: fix patch
Diffstat (limited to 'pkgs/development/python-modules/numpy')
| -rw-r--r-- | pkgs/development/python-modules/numpy/numpy-distutils-C++.patch | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch index 4b2d5c640e6..771da8cf3ff 100644 --- a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch +++ b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch @@ -1,23 +1,31 @@ diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py -index a92ccd3..9630e91 100644 +index 6ed5eec..82a88b5 100644 --- a/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py -@@ -43,10 +43,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts +@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts if opt not in llink_s: self.linker_so = llink_s.split() + opt.split() - display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) +- + # gcc style automatic dependencies, outputs a makefile (-MF) that lists + # all headers needed by a c file as a side effect of compilation (-MMD) + if getattr(self, '_auto_depends', False): +@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts + deps = [] + try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + - extra_postargs, display = display) + if self.detect_language(src) == 'c++': + display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src) -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps + + extra_postargs, display = display) + else: + display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + + extra_postargs, display = display) ++ except DistutilsExecError: msg = str(get_exception()) raise CompileError(msg) |