Hello community, here is the log from the commit of package openmpi for openSUSE:Factory checked in at 2015-01-23 16:17:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmpi (Old) and /work/SRC/openSUSE:Factory/.openmpi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi" Changes: -------- --- /work/SRC/openSUSE:Factory/openmpi/openmpi-testsuite.changes 2014-10-14 07:09:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openmpi.new/openmpi-testsuite.changes 2015-01-23 16:17:06.000000000 +0100 @@ -1,0 +2,36 @@ +Wed Jan 7 11:38:07 CET 2015 - p...@suse.de + +- Manually delete libvt-pomp.a. + +------------------------------------------------------------------- +Wed Dec 3 12:01:12 CET 2014 - p...@suse.de + +- Fix file list. +- Add an empty install section for openmpi-testsuite. +- Only build with OFED support for 13.2 and up. +- fix definition of with_openib. +- fix file list for building without OFED support. +- Only run autogen.sh when building for 13.1 or later so also patch + Makefile.in +- Make openmpi-testsuite a noarch package. + +------------------------------------------------------------------- +Sat Nov 29 01:02:00 UTC 2014 - Led <led...@gmail.com> + +- fix bashisms in vtrun script: option '-e' of 'echo' command may + be unsupported in some POSIX-complet shells +- add patches: + * openmpi-1.8.3-fix-bashisms.patch + +------------------------------------------------------------------- +Thu Oct 30 15:35:49 CET 2014 - p...@suse.de + +- Modify the tests in spec a bit + +------------------------------------------------------------------- +Wed Oct 29 16:27:00 CET 2014 - p...@suse.de + +- Only run scriptlets if we're building the regular openmpi + package. + +------------------------------------------------------------------- openmpi.changes: same change New: ---- openmpi-1.8.3-fix-bashisms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.wvHoRD/_old 2015-01-23 16:17:08.000000000 +0100 +++ /var/tmp/diff_new_pack.wvHoRD/_new 2015-01-23 16:17:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openmpi-testsuite # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,11 @@ # This will create the -testsuite spec and changes. # ########################################################################## +%if 0%{suse_version} > 1310 %define with_openib 1 +%else +%define with_openib 0 +%endif Name: openmpi-testsuite Version: 1.8.3 @@ -38,6 +42,7 @@ Source4: openmpi-rpmlintrc Patch1: openmpi-no_date_and_time.patch Patch2: openmpi-no_network_in_build.patch +Patch3: openmpi-1.8.3-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Modules BuildRequires: autoconf @@ -47,18 +52,25 @@ BuildRequires: gcc-fortran BuildRequires: libtool BuildRequires: mpi-selector + %if %{with_openib} BuildRequires: libibumad-devel BuildRequires: libibverbs-devel %endif + %ifarch x86_64 BuildRequires: numactl %endif + %ifarch %{ix86} x86_64 +%if %{with_openib} BuildRequires: infinipath-psm-devel %endif +%endif + %if "%{name}" == "openmpi-testsuite" BuildRequires: openmpi = %{version} +BuildArch: noarch %endif Requires: mpi-selector Requires(preun): mpi-selector @@ -80,7 +92,6 @@ This RPM contains all the tools necessary to compile, link, and run Open MPI jobs. -%endif %package libs Summary: OpenMPI runtime libraries @@ -110,23 +121,18 @@ This RPM contains all the wrappers necessary to compile, link, and run Open MPI jobs. - -%package devel-static -Summary: Static openMPI libraries -Group: Development/Libraries/Parallel -Requires: %{name}-devel = %{version} - -%description devel-static -This RPM contains the static library files, which are packaged separately from -the dynamic library and headers. +%endif # !openmpi-testsuite %prep %setup -q -n openmpi-%{version} %patch1 %patch2 +%patch3 -p1 %build +%if 0%suse_version > 1230 ./autogen.sh +%endif %configure --prefix="%{mpi_prefix}" \ --exec-prefix="%{mpi_prefix}" \ --bindir="%{mpi_bindir}" \ @@ -142,8 +148,10 @@ --enable-mpi-thread-multiple \ --with-threads \ %ifarch %{ix86} x86_64 +%if %with_openib --with-psm \ %endif +%endif --with-devel-headers make %{?_smp_mflags} V=1 @@ -179,12 +187,11 @@ done pushd %{buildroot}%{mpi_libdir} -rm libopen-trace-format.la -rm libotfaux.la +find -name '*.la' -print0 | xargs -0 rm -f -for f in libvt\*.la; do - sed -i 's%%-L.*.libs %%%%g' $f -done +rm -f libvt-pomp.a +# sed -i 's%%-L.*.libs %%%%g' $f +#done popd mkdir -p %{buildroot}%{_datadir}/modules/gnu-openmpi @@ -214,6 +221,7 @@ EOF %endif +%if "%{name}" == "openmpi" %post /usr/bin/mpi-selector \ --register %{name}-%{version} \ @@ -234,8 +242,6 @@ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%if "%{name}" == "openmpi" - %files %defattr(-, root, root) %doc NEWS README AUTHORS LICENSE @@ -256,7 +262,9 @@ # %dir %{mpi_datadir}/openmpi/amca-param-sets %dir %{mpi_datadir}/openmpi/doc +%if %with_openib %{mpi_datadir}/openmpi/amca-param-sets/btl-openib-benchmark +%endif %{mpi_datadir}/openmpi/amca-param-sets/example.conf %{mpi_datadir}/openmpi/doc/COPYRIGHT-ptmalloc2.txt # @@ -309,8 +317,10 @@ %{mpi_datadir}/openmpi/help-mca-var.txt %{mpi_datadir}/openmpi/help-mpi-api.txt %{mpi_datadir}/openmpi/help-mpi-btl-base.txt +%if %with_openib %{mpi_datadir}/openmpi/help-mpi-btl-openib-cpc-base.txt %{mpi_datadir}/openmpi/help-mpi-btl-openib.txt +%endif %{mpi_datadir}/openmpi/help-mpi-btl-sm.txt %{mpi_datadir}/openmpi/help-mpi-btl-tcp.txt %{mpi_datadir}/openmpi/help-mpi-btl-vader.txt @@ -322,9 +332,13 @@ %{mpi_datadir}/openmpi/help-mpi-runtime.txt %{mpi_datadir}/openmpi/help-mpool-base.txt %ifarch %ix86 x86_64 +%if %with_openib %{mpi_datadir}/openmpi/help-mtl-psm.txt %endif +%endif +%if %with_openib %{mpi_datadir}/openmpi/help-ompi-common-verbs.txt +%endif %{mpi_datadir}/openmpi/help-ompi-crcp-base.txt %{mpi_datadir}/openmpi/help-ompi-dpm-base.txt %{mpi_datadir}/openmpi/help-ompi-dpm-orte.txt @@ -380,7 +394,9 @@ %{mpi_datadir}/openmpi/help-shmem-api.txt %{mpi_datadir}/openmpi/help-shmem-runtime.txt %{mpi_datadir}/openmpi/help-state-staged-hnp.txt +%if %with_openib %{mpi_datadir}/openmpi/mca-btl-openib-device-params.ini +%endif %{mpi_datadir}/openmpi/mca-coll-ml.config %{mpi_datadir}/openmpi/help-mpi-coll-ml.txt %{mpi_datadir}/openmpi/help-oshmem-memheap.txt @@ -491,14 +507,8 @@ %{mpi_libdir}/*.so %{mpi_libdir}/pkgconfig/*.pc -%files devel-static -%defattr(-, root, root) -%{mpi_libdir}/*.la -%{mpi_libdir}/openmpi/*.la -%{mpi_libdir}/*.a -%endif +%else -%if "%{name}" == "openmpi-testsuite" %files %defattr(-, root, root) %doc test/util/test-suite.log ++++++ openmpi.spec ++++++ --- /var/tmp/diff_new_pack.wvHoRD/_old 2015-01-23 16:17:08.000000000 +0100 +++ /var/tmp/diff_new_pack.wvHoRD/_new 2015-01-23 16:17:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openmpi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,11 @@ # This will create the -testsuite spec and changes. # ########################################################################## +%if 0%{suse_version} > 1310 %define with_openib 1 +%else +%define with_openib 0 +%endif Name: openmpi Version: 1.8.3 @@ -38,6 +42,7 @@ Source4: openmpi-rpmlintrc Patch1: openmpi-no_date_and_time.patch Patch2: openmpi-no_network_in_build.patch +Patch3: openmpi-1.8.3-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Modules BuildRequires: autoconf @@ -47,18 +52,25 @@ BuildRequires: gcc-fortran BuildRequires: libtool BuildRequires: mpi-selector + %if %{with_openib} BuildRequires: libibumad-devel BuildRequires: libibverbs-devel %endif + %ifarch x86_64 BuildRequires: numactl %endif + %ifarch %{ix86} x86_64 +%if %{with_openib} BuildRequires: infinipath-psm-devel %endif +%endif + %if "%{name}" == "openmpi-testsuite" BuildRequires: openmpi = %{version} +BuildArch: noarch %endif Requires: mpi-selector Requires(preun): mpi-selector @@ -80,7 +92,6 @@ This RPM contains all the tools necessary to compile, link, and run Open MPI jobs. -%endif %package libs Summary: OpenMPI runtime libraries @@ -110,23 +121,18 @@ This RPM contains all the wrappers necessary to compile, link, and run Open MPI jobs. - -%package devel-static -Summary: Static openMPI libraries -Group: Development/Libraries/Parallel -Requires: %{name}-devel = %{version} - -%description devel-static -This RPM contains the static library files, which are packaged separately from -the dynamic library and headers. +%endif # !openmpi-testsuite %prep %setup -q -n openmpi-%{version} %patch1 %patch2 +%patch3 -p1 %build +%if 0%suse_version > 1230 ./autogen.sh +%endif %configure --prefix="%{mpi_prefix}" \ --exec-prefix="%{mpi_prefix}" \ --bindir="%{mpi_bindir}" \ @@ -142,8 +148,10 @@ --enable-mpi-thread-multiple \ --with-threads \ %ifarch %{ix86} x86_64 +%if %with_openib --with-psm \ %endif +%endif --with-devel-headers make %{?_smp_mflags} V=1 @@ -179,12 +187,11 @@ done pushd %{buildroot}%{mpi_libdir} -rm libopen-trace-format.la -rm libotfaux.la +find -name '*.la' -print0 | xargs -0 rm -f -for f in libvt\*.la; do - sed -i 's%%-L.*.libs %%%%g' $f -done +rm -f libvt-pomp.a +# sed -i 's%%-L.*.libs %%%%g' $f +#done popd mkdir -p %{buildroot}%{_datadir}/modules/gnu-openmpi @@ -214,6 +221,7 @@ EOF %endif +%if "%{name}" == "openmpi" %post /usr/bin/mpi-selector \ --register %{name}-%{version} \ @@ -234,8 +242,6 @@ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%if "%{name}" == "openmpi" - %files %defattr(-, root, root) %doc NEWS README AUTHORS LICENSE @@ -256,7 +262,9 @@ # %dir %{mpi_datadir}/openmpi/amca-param-sets %dir %{mpi_datadir}/openmpi/doc +%if %with_openib %{mpi_datadir}/openmpi/amca-param-sets/btl-openib-benchmark +%endif %{mpi_datadir}/openmpi/amca-param-sets/example.conf %{mpi_datadir}/openmpi/doc/COPYRIGHT-ptmalloc2.txt # @@ -309,8 +317,10 @@ %{mpi_datadir}/openmpi/help-mca-var.txt %{mpi_datadir}/openmpi/help-mpi-api.txt %{mpi_datadir}/openmpi/help-mpi-btl-base.txt +%if %with_openib %{mpi_datadir}/openmpi/help-mpi-btl-openib-cpc-base.txt %{mpi_datadir}/openmpi/help-mpi-btl-openib.txt +%endif %{mpi_datadir}/openmpi/help-mpi-btl-sm.txt %{mpi_datadir}/openmpi/help-mpi-btl-tcp.txt %{mpi_datadir}/openmpi/help-mpi-btl-vader.txt @@ -322,9 +332,13 @@ %{mpi_datadir}/openmpi/help-mpi-runtime.txt %{mpi_datadir}/openmpi/help-mpool-base.txt %ifarch %ix86 x86_64 +%if %with_openib %{mpi_datadir}/openmpi/help-mtl-psm.txt %endif +%endif +%if %with_openib %{mpi_datadir}/openmpi/help-ompi-common-verbs.txt +%endif %{mpi_datadir}/openmpi/help-ompi-crcp-base.txt %{mpi_datadir}/openmpi/help-ompi-dpm-base.txt %{mpi_datadir}/openmpi/help-ompi-dpm-orte.txt @@ -380,7 +394,9 @@ %{mpi_datadir}/openmpi/help-shmem-api.txt %{mpi_datadir}/openmpi/help-shmem-runtime.txt %{mpi_datadir}/openmpi/help-state-staged-hnp.txt +%if %with_openib %{mpi_datadir}/openmpi/mca-btl-openib-device-params.ini +%endif %{mpi_datadir}/openmpi/mca-coll-ml.config %{mpi_datadir}/openmpi/help-mpi-coll-ml.txt %{mpi_datadir}/openmpi/help-oshmem-memheap.txt @@ -491,14 +507,8 @@ %{mpi_libdir}/*.so %{mpi_libdir}/pkgconfig/*.pc -%files devel-static -%defattr(-, root, root) -%{mpi_libdir}/*.la -%{mpi_libdir}/openmpi/*.la -%{mpi_libdir}/*.a -%endif +%else -%if "%{name}" == "openmpi-testsuite" %files %defattr(-, root, root) %doc test/util/test-suite.log ++++++ openmpi-1.8.3-fix-bashisms.patch ++++++ diff -Ndur openmpi-1.8.3/ompi/contrib/vt/vt/tools/vtrun/vtrun.in openmpi-1.8.3-fix-bashisms/ompi/contrib/vt/vt/tools/vtrun/vtrun.in --- openmpi-1.8.3/ompi/contrib/vt/vt/tools/vtrun/vtrun.in 2014-07-11 21:12:19.000000000 +0300 +++ openmpi-1.8.3-fix-bashisms/ompi/contrib/vt/vt/tools/vtrun/vtrun.in 2014-11-29 02:58:46.593455828 +0200 @@ -110,9 +110,9 @@ { if test $verbose -ge $1; then if test $mpi -eq 1; then - echo -e "$EXENAME: [$PID]: $2" + echo "$EXENAME: [$PID]: $2" else - echo -e "$EXENAME: $2" + echo "$EXENAME: $2" fi fi } @@ -123,9 +123,9 @@ error_msg() { if test $mpi -eq 1; then - echo -e "$EXENAME: [$PID]: $*" >&2 + echo "$EXENAME: [$PID]: $*" >&2 else - echo -e "$EXENAME: $*" >&2 + echo "$EXENAME: $*" >&2 fi } ++++++ openmpi-no_network_in_build.patch ++++++ --- /var/tmp/diff_new_pack.wvHoRD/_old 2015-01-23 16:17:08.000000000 +0100 +++ /var/tmp/diff_new_pack.wvHoRD/_new 2015-01-23 16:17:08.000000000 +0100 @@ -1,11 +1,12 @@ --- test/util/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + test/util/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) Index: test/util/Makefile.am =================================================================== ---- test/util/Makefile.am.orig 2014-04-22 16:51:00.000000000 +0200 -+++ test/util/Makefile.am 2014-04-29 18:37:08.260494412 +0200 +--- test/util/Makefile.am.orig 2014-07-11 20:11:55.000000000 +0200 ++++ test/util/Makefile.am 2014-12-01 15:41:45.023557045 +0100 @@ -33,7 +33,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/test/suppo @@ -15,3 +16,16 @@ TESTS = \ $(check_PROGRAMS) +Index: test/util/Makefile.in +=================================================================== +--- test/util/Makefile.in.orig 2014-09-25 16:11:31.000000000 +0200 ++++ test/util/Makefile.in 2014-12-01 15:44:31.499729817 +0100 +@@ -70,7 +70,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-check_PROGRAMS = opal_bit_ops$(EXEEXT) opal_path_nfs$(EXEEXT) ++check_PROGRAMS = opal_bit_ops$(EXEEXT) + subdir = test/util + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/depcomp -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org