Hello community, here is the log from the commit of package openmpi for openSUSE:Factory checked in at 2015-05-16 07:12:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-04-28 20:41:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openmpi.new/openmpi-testsuite.changes 2015-05-16 07:12:33.000000000 +0200 @@ -1,0 +2,19 @@ +Wed May 6 10:29:01 CEST 2015 - [email protected] + +- Use the distro supplied libldl, not the internal copy. +- Add openmpi-external_libltdl.patch to make dlopen_test also compile + with external libltdl. +- Run autogen.sh again, needed by the new patch as it modifies + Makefile.am. + +------------------------------------------------------------------- +Tue Apr 28 13:23:38 CEST 2015 - [email protected] + +- Just include README as a dummy. As openmpi-testsuite is only + meant to run the testsuite, the built package doesn't contain + anything usefull and in case of test failures the package would + not be created. +- Make clear that disabling Fortran 2008 support is only needed + until gcc5 becomes the default. + +------------------------------------------------------------------- @@ -17 +36 @@ - automatically when using GCC 5. + automatically when using GCC 5. Reenable when gcc5 is the default. openmpi.changes: same change New: ---- openmpi-external_libltdl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.zjxd1P/_old 2015-05-16 07:12:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zjxd1P/_new 2015-05-16 07:12:34.000000000 +0200 @@ -43,6 +43,7 @@ Patch1: openmpi-no_date_and_time.patch Patch2: openmpi-no_network_in_build.patch Patch3: openmpi-1.8.3-fix-bashisms.patch +Patch4: openmpi-external_libltdl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Modules BuildRequires: autoconf @@ -83,7 +84,8 @@ %description %if "%{name}" == "openmpi-testsuite" -This package contains the test log in the documentation directory +This package is just needed to run the testsuite and doesn't contain +anything interesting. %else Open MPI is a project combining technologies and resources from several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to @@ -127,8 +129,16 @@ %patch1 %patch2 %patch3 -p1 +%patch4 %build +%if 0%{suse_version} >= 1315 +# To force rebuilding Makefile.in +rm -f ompi/debuggers/Makefile.in + +./autogen.sh +%endif + %configure --prefix="%{mpi_prefix}" \ --exec-prefix="%{mpi_prefix}" \ --bindir="%{mpi_bindir}" \ @@ -138,6 +148,7 @@ --mandir="%{mpi_mandir}" \ --disable-static \ --enable-builtin-atomics \ + --with-libltdl=external \ %if %{with_openib} --with-verbs \ %endif @@ -150,8 +161,9 @@ %endif --with-devel-headers \ --with-package-string="Open MPI Distribution for SUSE" \ - --enable-mpi-fortran=usempi -make %{?_smp_mflags} V=1 + --enable-mpi-fortran=usempi \ + --disable-silent-rules +make %{?_smp_mflags} %if "%{name}" == "openmpi-testsuite" %check @@ -509,6 +521,11 @@ %{mpi_libdir}/*.so %{mpi_libdir}/pkgconfig/*.pc +%else + +%files +%defattr(-, root, root) +%doc README %endif %changelog ++++++ openmpi.spec ++++++ --- /var/tmp/diff_new_pack.zjxd1P/_old 2015-05-16 07:12:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zjxd1P/_new 2015-05-16 07:12:34.000000000 +0200 @@ -43,6 +43,7 @@ Patch1: openmpi-no_date_and_time.patch Patch2: openmpi-no_network_in_build.patch Patch3: openmpi-1.8.3-fix-bashisms.patch +Patch4: openmpi-external_libltdl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Modules BuildRequires: autoconf @@ -83,7 +84,8 @@ %description %if "%{name}" == "openmpi-testsuite" -This package contains the test log in the documentation directory +This package is just needed to run the testsuite and doesn't contain +anything interesting. %else Open MPI is a project combining technologies and resources from several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to @@ -127,8 +129,16 @@ %patch1 %patch2 %patch3 -p1 +%patch4 %build +%if 0%{suse_version} >= 1315 +# To force rebuilding Makefile.in +rm -f ompi/debuggers/Makefile.in + +./autogen.sh +%endif + %configure --prefix="%{mpi_prefix}" \ --exec-prefix="%{mpi_prefix}" \ --bindir="%{mpi_bindir}" \ @@ -138,6 +148,7 @@ --mandir="%{mpi_mandir}" \ --disable-static \ --enable-builtin-atomics \ + --with-libltdl=external \ %if %{with_openib} --with-verbs \ %endif @@ -150,8 +161,9 @@ %endif --with-devel-headers \ --with-package-string="Open MPI Distribution for SUSE" \ - --enable-mpi-fortran=usempi -make %{?_smp_mflags} V=1 + --enable-mpi-fortran=usempi \ + --disable-silent-rules +make %{?_smp_mflags} %if "%{name}" == "openmpi-testsuite" %check @@ -509,6 +521,11 @@ %{mpi_libdir}/*.so %{mpi_libdir}/pkgconfig/*.pc +%else + +%files +%defattr(-, root, root) +%doc README %endif %changelog ++++++ openmpi-external_libltdl.patch ++++++ From: Philipp Thomas <[email protected]> Date: 2015-05-06 15:52:58+02:00 Subject: Build testsuite with external libltdl References: Upstream: Do not reference the included libltdl when using an external version. --- config/opal_setup_libltdl.m4 | 2 ++ ompi/debuggers/Makefile.am | 4 ++++ 2 files changed, 6 insertions(+) Index: config/opal_setup_libltdl.m4 =================================================================== --- config/opal_setup_libltdl.m4.orig 2014-07-11 20:12:32.000000000 +0200 +++ config/opal_setup_libltdl.m4 2015-05-06 11:41:01.997749616 +0200 @@ -137,6 +137,8 @@ AC_DEFUN([OPAL_SETUP_LIBLTDL],[ AM_CONDITIONAL(OPAL_HAVE_DLOPEN, [test "$OPAL_ENABLE_DLOPEN_SUPPORT" = "1"]) + AM_CONDITIONAL(OPAL_LIBLTDL_INTERNAL, + [test "$OPAL_LIBLTDL_INTERNAL" = "1"]) OPAL_VAR_SCOPE_POP([HAPPY]) ])dnl Index: ompi/debuggers/Makefile.am =================================================================== --- ompi/debuggers/Makefile.am.orig 2014-07-11 20:12:31.000000000 +0200 +++ ompi/debuggers/Makefile.am 2015-05-06 10:28:00.125040630 +0200 @@ -46,8 +46,12 @@ headers = \ # Simple checks to ensure that the DSOs are functional dlopen_test_SOURCES = dlopen_test.c +if OPAL_LIBLTDL_INTERNAL dlopen_test_CPPFLAGS = -I$(top_srcdir)/opal/libltdl dlopen_test_LDADD = $(top_builddir)/opal/libltdl/libltdlc.la +else +dlopen_test_LDFLAGS = -lltdl +endif predefined_gap_test_SOURCES = predefined_gap_test.c predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
