commit 7953ad1f62ca1ece65ee82ac1d99375cdd1e7700
Author: Jan Rękorajski <[email protected]>
Date:   Wed Mar 8 08:01:25 2017 +0100

    - fixed BRs
    - don't use -m64 gcc flag, breaks x32
    - rel 9

 no-m64.patch      | 21 +++++++++++++++++++++
 python-pypar.spec |  6 ++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/python-pypar.spec b/python-pypar.spec
index 6aae2d8..11d6f16 100644
--- a/python-pypar.spec
+++ b/python-pypar.spec
@@ -4,16 +4,17 @@ Summary:      pypar - Parallel Programming in the spirit of 
Python!
 Summary(pl.UTF-8):     pypar - programowanie równoległe w duchu Pythona
 Name:          python-%{module}
 Version:       1.9.3
-Release:       8
+Release:       9
 License:       GPL
 Group:         Libraries/Python
 Source0:       http://datamining.anu.edu.au/~ole/pypar/%{module}_%{version}.tgz
 # Source0-md5: 7039dc549acd1db9806e7510c8eb93dc
 Patch0:                %{name}-build.patch
 Patch1:                numpy.patch
+Patch2:                no-m64.patch
 URL:           http://datamining.anu.edu.au/~ole/pypar/
 BuildRequires: rpmbuild(macros) >= 1.710
-BuildRequires: mpi
+BuildRequires: mpich-devel
 BuildRequires: python-devel >= 1:2.5
 BuildRequires: python-numarray-devel
 BuildRequires: python-numpy-devel
@@ -51,6 +52,7 @@ Pakiet zawierający programy przykładowe dla modułu Pythona 
pypar.
 %setup -q -n %{module}_%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export CFLAGS="%{rpmcflags}"
diff --git a/no-m64.patch b/no-m64.patch
new file mode 100644
index 0000000..083aceb
--- /dev/null
+++ b/no-m64.patch
@@ -0,0 +1,21 @@
+--- pypar_1.9.3/setup.py~      2017-03-08 07:58:00.000000000 +0100
++++ pypar_1.9.3/setup.py       2017-03-08 07:59:14.024051775 +0100
+@@ -132,17 +132,7 @@
+     mpi_flags = get_mpi_flags()
+     numpy_include_dir = _get_numpy_include_dir()
+ 
+-
+-    # FIXME: It would be good to set specific compiler flags, e.g.
+-    # for our AMD opteron cluster which is using the portland group
+-    # compiler pgcc, but I can't get this to work let alone get distutils
+-    # to give some diagnostics on what flags it is actually using.
+-    if os.name == 'posix' and os.uname()[4] == 'x86_64':
+-        #Extra flags for 64 bit architectures
+-        #extra_compile_args = ' -fPIC -m64' #Valid for gcc        
+-        extra_compile_args = ['-fPIC', '-m64'] #Valid for pgcc
+-    else:
+-        extra_compile_args = None
++    extra_compile_args = ['-fPIC']
+ 
+ 
+     
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pypar.git/commitdiff/7953ad1f62ca1ece65ee82ac1d99375cdd1e7700

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to