diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/scientificpython/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
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
Diffstat (limited to 'dev-python/scientificpython/files')
3 files changed, 112 insertions, 0 deletions
diff --git a/dev-python/scientificpython/files/scientificpython-2.9-mpi.patch b/dev-python/scientificpython/files/scientificpython-2.9-mpi.patch new file mode 100644 index 000000000000..3140779c74a9 --- /dev/null +++ b/dev-python/scientificpython/files/scientificpython-2.9-mpi.patch @@ -0,0 +1,40 @@ +--- 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)) diff --git a/dev-python/scientificpython/files/scientificpython-2.9.1-mpi-netcdf.patch b/dev-python/scientificpython/files/scientificpython-2.9.1-mpi-netcdf.patch new file mode 100644 index 000000000000..622032d4d174 --- /dev/null +++ b/dev-python/scientificpython/files/scientificpython-2.9.1-mpi-netcdf.patch @@ -0,0 +1,29 @@ +--- setup.py ++++ setup.py +@@ -2,7 +2,7 @@ + + from distutils.core import setup, Extension + from distutils.command.install_headers import install_headers +-import os, sys, platform ++import os, sys, platform, subprocess + from glob import glob + + class Dummy: +@@ -103,13 +103,16 @@ + netcdf_include = os.path.join(netcdf_prefix, 'include') + netcdf_h_file = os.path.join(netcdf_prefix, 'include', 'netcdf.h') + netcdf_lib = os.path.join(netcdf_prefix, 'lib') ++ mpi_cflags = subprocess.Popen(["mpicc", "-showme:compile"], stdout=subprocess.PIPE).communicate()[0].rstrip().split() ++ mpi_ldflags = subprocess.Popen(["mpicc", "-showme:link"], stdout=subprocess.PIPE).communicate()[0].rstrip().split() + ext_modules = [Extension('Scientific_netcdf', + ['Src/Scientific_netcdf.c'], + include_dirs=['Include', netcdf_include] + + arrayobject_h_include, + library_dirs=[netcdf_lib], + libraries = ['netcdf'], +- extra_compile_args=extra_compile_args)] ++ extra_compile_args=extra_compile_args + mpi_cflags, ++ extra_link_args=mpi_ldflags)] + + try: + # Add code for including documentation in Mac packages diff --git a/dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch b/dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch new file mode 100644 index 000000000000..c9672948f2f8 --- /dev/null +++ b/dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch @@ -0,0 +1,43 @@ +From 71a5e881290c1cec2506a346e2740a1b821c36aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Thu, 13 Mar 2014 15:29:33 +0100 +Subject: [PATCH] Include MPI cflags/ldflags for netcdf. + +--- + setup.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 7f01656..71ac92a 100644 +--- a/setup.py ++++ b/setup.py +@@ -2,7 +2,7 @@ + + from distutils.core import setup, Extension + from distutils.command.install_headers import install_headers +-import os, sys, platform ++import os, sys, platform, subprocess + from glob import glob + + class Dummy: +@@ -92,13 +92,16 @@ else: + netcdf_include = os.path.join(netcdf_prefix, 'include') + netcdf_h_file = os.path.join(netcdf_prefix, 'include', 'netcdf.h') + netcdf_lib = os.path.join(netcdf_prefix, 'lib') ++ mpi_cflags = subprocess.Popen(["mpicc", "-showme:compile"], stdout=subprocess.PIPE).communicate()[0].rstrip().split() ++ mpi_ldflags = subprocess.Popen(["mpicc", "-showme:link"], stdout=subprocess.PIPE).communicate()[0].rstrip().split() + ext_modules = [Extension('Scientific._netcdf', + ['Scientific/_netcdf.c'], + include_dirs=['Include', netcdf_include] + + numpy_include, + library_dirs=[netcdf_lib], + libraries = ['netcdf'], +- extra_compile_args=extra_compile_args)] ++ extra_compile_args=extra_compile_args + mpi_cflags, ++ extra_link_args=mpi_ldflags)] + + try: + # Add code for including documentation in Mac packages +-- +1.9.0 + |