Hello community, here is the log from the commit of package quantum-espresso for openSUSE:Factory checked in at 2015-08-10 09:15:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quantum-espresso (Old) and /work/SRC/openSUSE:Factory/.quantum-espresso.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quantum-espresso" Changes: -------- --- /work/SRC/openSUSE:Factory/quantum-espresso/quantum-espresso.changes 2015-03-18 13:04:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quantum-espresso.new/quantum-espresso.changes 2015-08-10 09:15:55.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Aug 6 17:37:51 UTC 2015 - [email protected] + +- Two new patches to build ppc64/ppc64le archi + (not yet upstream) + quantum_espresso_add_ppc64le_archi_to_configure.patch + quantum_espresso_do_not_set_xlf_for_powerpc.patch + +------------------------------------------------------------------- New: ---- quantum_espresso_add_ppc64le_archi_to_configure.patch quantum_espresso_do_not_set_xlf_for_powerpc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quantum-espresso.spec ++++++ --- /var/tmp/diff_new_pack.FhStur/_old 2015-08-10 09:15:56.000000000 +0200 +++ /var/tmp/diff_new_pack.FhStur/_new 2015-08-10 09:15:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package quantum-espresso # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,6 +41,8 @@ Source6: http://qe-forge.org/gf/download/frsrelease/185/757/xspectra-%{version}.tar.gz # PATCH-FIX-UPSTREAM espresso-implicit-pointer-decl.patch Patch0: espresso-implicit-pointer-decl.patch +Patch1: quantum_espresso_add_ppc64le_archi_to_configure.patch +Patch2: quantum_espresso_do_not_set_xlf_for_powerpc.patch BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: gcc-fortran @@ -52,6 +54,7 @@ BuildRequires: mvapich2-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExcludeArch: ppc %description Quantum ESPRESSO is an integrated suite of Open-Source computer codes for @@ -97,6 +100,10 @@ %setup -q -n espresso-%{version} %setup -q -n espresso-%{version} -a1 -a2 -a3 -a5 -a4 -a6 %patch0 -p1 +%ifarch ppc64 ppc64le +%patch1 -p1 +%patch2 -p1 +%endif echo "prepare parallel builds: %_mpi" set -- * ++++++ quantum_espresso_add_ppc64le_archi_to_configure.patch ++++++ From: Michel Normand <[email protected]> Subject: quantum espresso add ppc64le archi to configure Date: Thu, 06 Aug 2015 18:56:41 +0200 quantum espresso add ppc64le archi to configure Signed-off-by: Michel Normand <[email protected]> --- install/configure | 1 + install/configure.ac | 1 + 2 files changed, 2 insertions(+) Index: espresso-5.1.2/install/configure =================================================================== --- espresso-5.1.2.orig/install/configure +++ espresso-5.1.2/install/configure @@ -2191,6 +2191,7 @@ then *-pc-cygwin ) arch=cygwin ;; sx*-nec* ) arch=necsx ;; powerpc64-*-linux-gnu ) arch=ppc64 ;; + powerpc64le-*-linux-gnu ) arch=ppc64 ;; *-*-mingw32 ) arch=mingw32;; *-*-mingw64 ) arch=mingw64;; * ) { $as_echo "$as_me:$LINENO: WARNING: Unrecognized build architecture" >&5 Index: espresso-5.1.2/install/configure.ac =================================================================== --- espresso-5.1.2.orig/install/configure.ac +++ espresso-5.1.2/install/configure.ac @@ -208,6 +208,7 @@ then *-pc-cygwin ) arch=cygwin ;; sx*-nec* ) arch=necsx ;; powerpc64-*-linux-gnu ) arch=ppc64 ;; + powerpc64le-*-linux-gnu ) arch=ppc64 ;; *-*-mingw32 ) arch=mingw32;; *-*-mingw64 ) arch=mingw64;; * ) AC_MSG_WARN(Unrecognized build architecture) ++++++ quantum_espresso_do_not_set_xlf_for_powerpc.patch ++++++ From: Michel Normand <[email protected]> Subject: quantum espresso do not set xlf for powerpc Date: Thu, 06 Aug 2015 18:56:52 +0200 There are two changes in this patch, specific to ppc/ppc64le: 1- do not set xlf for powerpc. This probably need more discussion with upstream but at least required to avoid ppc64/ppc64le build error: === [ 74s] gfortran -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -x f95-cpp-input -D__XLF -D__GFORTRAN -D__STD_F95 -D__FFTW3 -I../include -I../iotk/src -I../ELPA/src -I. -c parser.f90 [ 74s] f951: Warning: Nonexistent include directory '../ELPA/src' [-Wmissing-include-dirs] [ 74s] parser.f90:65:21: [ 74s] [ 74s] CHARACTER(LEN=1), AUTOMATIC :: sep1, sep2 [ 74s] 1 [ 74s] Error: Invalid character in name at (1) === 2- undef vector and pixel for cpp preprocessor Required to avoid ppc64/ppc64le build error: === [ 494s] cpp -P -C -traditional -D__FFTW3 -D__MPI -D__PARA -I../include input_parameters.f90 -o input_parameters.F90 ; \ [ 494s] /usr/lib64/mpi/gcc/openmpi/bin/mpif90 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -D__FFTW3 -D__MPI -D__PARA -I../include -I../iotk/src -I../ELPA/src -I. -c input_parameters.F90 -o input_parameters.o [ 494s] input_parameters.f90:221:0: error: detected recursion whilst expanding macro "vector" [ 494s] ! G-vector for polarization calculation ( related to lberry ) [ 494s] ^ === Signed-off-by: Michel Normand <[email protected]> --- install/configure | 8 ++++---- install/configure.ac | 8 ++++---- install/m4/x_ac_qe_mpif90.m4 | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) Index: espresso-5.1.2/install/configure =================================================================== --- espresso-5.1.2.orig/install/configure +++ espresso-5.1.2/install/configure @@ -2268,7 +2268,6 @@ necsx ) ppc64 ) try_mpif90="mpxlf90_r mpf90_r mpif90" try_f90="xlf90_r $try_f90" - try_dflags="-D__XLF" try_arflags="ruv" ;; # PowerPC MareNostrum @@ -5928,9 +5927,10 @@ if test "$cpp" = "" ; then cpp=$try_cpp; echo setting CPP... $cpp echo $ECHO_N "setting CPPFLAGS... $ECHO_C" -case $cpp in - cpp) try_cppflags="-P -C -traditional" ;; - fpp) try_cppflags="-P -C " ;; +case "$arch:$cpp" in + ppc64:cpp) try_cppflags="-P -C -traditional -Uvector -Upixel" ;; + *:cpp) try_cppflags="-P -C -traditional" ;; + *:fpp) try_cppflags="-P -C " ;; *) try_cppflags="" ;; esac if test "$cppflags" = "" ; then cppflags=$try_cppflags ; fi Index: espresso-5.1.2/install/configure.ac =================================================================== --- espresso-5.1.2.orig/install/configure.ac +++ espresso-5.1.2/install/configure.ac @@ -284,7 +284,6 @@ necsx ) ppc64 ) try_mpif90="mpxlf90_r mpf90_r mpif90" try_f90="xlf90_r $try_f90" - try_dflags="-D__XLF" try_arflags="ruv" ;; # PowerPC MareNostrum @@ -884,9 +883,10 @@ if test "$cpp" = "" ; then cpp=$try_cpp; echo setting CPP... $cpp echo $ECHO_N "setting CPPFLAGS... $ECHO_C" -case $cpp in - cpp) try_cppflags="-P -C -traditional" ;; - fpp) try_cppflags="-P -C " ;; +case "$arch:$cpp" in + ppc64:cpp) try_cppflags="-P -C -traditional -Uvector -Upixel" ;; + *:cpp) try_cppflags="-P -C -traditional" ;; + *:fpp) try_cppflags="-P -C " ;; *) try_cppflags="" ;; esac if test "$cppflags" = "" ; then cppflags=$try_cppflags ; fi Index: espresso-5.1.2/install/m4/x_ac_qe_mpif90.m4 =================================================================== --- espresso-5.1.2.orig/install/m4/x_ac_qe_mpif90.m4 +++ espresso-5.1.2/install/m4/x_ac_qe_mpif90.m4 @@ -64,7 +64,6 @@ necsx ) ppc64 ) try_mpif90="mpxlf90_r mpf90_r mpif90" try_f90="xlf90_r $try_f90" - try_dflags="-D__XLF" ;; # PowerPC MareNostrum ppc64-mn )
