gentoo/dev-python/scientificpython/files/scientificpython-2.9-mpi.patch
Robin H. Johnson 56bd759df1
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
2015-08-08 17:38:18 -07:00

41 lines
1.1 KiB
Diff

--- Src/MPI/compile.py
+++ Src/MPI/compile.py
@@ -4,7 +4,7 @@
# Normally nothing needs to be changed below
import distutils
import distutils.sysconfig
-import os, sys
+import os, subprocess, sys
from Scientific import N
cfgDict = distutils.sysconfig.get_config_vars()
@@ -32,16 +32,16 @@
items[i] = os.path.join(frameworkdir[0], items[i])
linkforshared = ' '.join(items)
-cmd = '%s %s -o mpipython -I%s %s %s -L%s -lpython%s %s %s' % \
- (mpicompiler,
- linkforshared,
- cfgDict['INCLUDEPY'],
- extra_compile_args,
- sources,
- cfgDict['LIBPL'],
- cfgDict['VERSION'],
- cfgDict['LIBS'],
- cfgDict['LIBM'])
+cmd = [mpicompiler]
+cmd.extend(linkforshared.split())
+cmd.extend(os.environ.get("CFLAGS", "").split())
+cmd.extend(os.environ.get("LDFLAGS", "").split())
+cmd.extend(["-o", "mpipython"])
+cmd.extend(["-I" + x for x in cfgDict['INCLUDEPY'].split()])
+cmd.extend(["-I../../Include"])
+cmd.extend(extra_compile_args.split())
+cmd.extend(sources.split())
+cmd.extend(["-lpython%s" % cfgDict['VERSION']])
-print 'cmd = ', cmd
-os.system(cmd)
+print 'cmd =', " ".join(cmd)
+sys.exit(subprocess.call(cmd))