rpms/ScientificPython/devel ScientificPython-mpi-compile.patch, NONE, 1.1 ScientificPython.spec, 1.17, 1.18
Jef Spaleta
jspaleta at fedoraproject.org
Mon Mar 2 03:00:58 UTC 2009
Author: jspaleta
Update of /cvs/pkgs/rpms/ScientificPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21282
Modified Files:
ScientificPython.spec
Added Files:
ScientificPython-mpi-compile.patch
Log Message:
* Sun Mar 1 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-4
- Fix MPI compile script
ScientificPython-mpi-compile.patch:
--- NEW FILE ScientificPython-mpi-compile.patch ---
--- ScientificPython-2.8/Src/MPI/compile.py.old 2009-03-01 17:31:49.000000000 -0900
+++ ScientificPython-2.8/Src/MPI/compile.py 2009-03-01 17:57:54.000000000 -0900
@@ -8,17 +8,19 @@
from Scientific import N
cfgDict = distutils.sysconfig.get_config_vars()
-
# Name of the MPI compilation script.
mpicompiler = 'mpicc'
sources='mpipython.c Scientific_mpi.c'
extra_compile_args = ""
if N.package == "NumPy":
+ arrayobject_h_include64 = os.path.join(sys.prefix,
+ "lib64/python%s.%s/site-packages/numpy/core/include"
+ % sys.version_info [:2])
arrayobject_h_include = os.path.join(sys.prefix,
"lib/python%s.%s/site-packages/numpy/core/include"
% sys.version_info [:2])
- extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include
+ extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include+" -I"+arrayobject_h_include64+" -I../../Include"
linkforshared = cfgDict['LINKFORSHARED']
if sys.platform == 'darwin':
Index: ScientificPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ScientificPython.spec 2 Mar 2009 02:10:51 -0000 1.17
+++ ScientificPython.spec 2 Mar 2009 03:00:28 -0000 1.18
@@ -3,7 +3,7 @@
Name: ScientificPython
Version: 2.8
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A collection of Python modules that are useful for scientific computing
Group: Development/Languages
@@ -11,6 +11,7 @@
URL: http://dirac.cnrs-orleans.fr/ScientificPython/
Source0: http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-%{version}.tar.gz
Patch0: ScientificPython-arch-lib.patch
+Patch1: ScientificPython-mpi-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
@@ -69,6 +70,7 @@
%prep
%setup -q
%patch0 -p 1
+%patch1 -p 1
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -77,12 +79,12 @@
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
export PYTHONPATH="$PYTHONPATH:$RPM_BUILD_ROOT/%{python_sitearch}/"
-export PYINCLUDE="$RPM_BUILD_ROOT/%{_includedir}/python%{pyver}/"
-export NUMPYINCLUDE="$RPM_BUILD_ROOT/%{python_sitearch}//numpy/core/include/"
+#export PYINCLUDE="$RPM_BUILD_ROOT/%{_includedir}/python%{pyver}/"
+#export NUMPYINCLUDE="$RPM_BUILD_ROOT/%{python_sitearch}//numpy/core/include/"
#cp -R %{_includedir}/python%{pyver}/* $PYINCLUDE
cd Src/MPI/
-cat compile.py|sed -e 's/-I/-I$PYINCLUDE -I$NUMPYINCLUDE -I/' > compile-new.py
-%{__python} compile-new.py
+#cat compile.py|sed -e 's/-I/-I$PYINCLUDE -I$NUMPYINCLUDE -I/' > compile-new.py
+%{__python} compile.py
mv mpipython $RPM_BUILD_ROOT/%{_bindir}/
cat <<EOF > impipython.sh
@@ -153,6 +155,9 @@
%doc Doc/Reference Examples Doc/BSP_Tutorial.pdf
%changelog
+* Sun Mar 1 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-4
+- Fix MPI compile script
+
* Sun Mar 1 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-3
- Fixed lib64 build issue
More information about the scm-commits
mailing list