From 883344a08abd66ea3d08dac9e06bf940ee1cb29b8c115e5b3cce33ae5f9b62dc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 20 Mar 2009 18:16:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=29 --- boost.changes | 6 ++++++ boost.spec | 9 ++++++--- boost.spec.in | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/boost.changes b/boost.changes index eb9ccb2..94cb2e5 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 16 14:39:20 CET 2009 - pth@suse.de + +- Don't rely on system default mpi implementation being set. This + fixes building boost on systems before openSUSE 11.0. + ------------------------------------------------------------------- Tue Mar 3 11:30:07 CET 2009 - pth@suse.de diff --git a/boost.spec b/boost.spec index 956b390..228ab67 100644 --- a/boost.spec +++ b/boost.spec @@ -45,7 +45,7 @@ Group: Development/Libraries/C and C++ Summary: Boost C++ Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 1.38.0 -Release: 4 +Release: 5 Source0: %{name}_1_38_0.tar.bz2 Source1: boost-rpmlintrc Source2: boost_1_33_1_man.tar.bz2 @@ -361,7 +361,7 @@ using mpi ; EOF # Set PATH, MANPATH and LD_LIBRARY_PATH %if %build_mpi -source /var/mpi-selector/data/$(cat /etc/sysconfig/mpi-selector).sh +source /var/mpi-selector/data/$(rpm --qf "%{VERSION}" -q openmpi).sh %endif %{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam cflags="%{optflags}" cxxflags="%{optflags}" stage || (echo "Not all Boost libraries built properly."; exit 1) @@ -389,7 +389,7 @@ export EXPAT_INCLUDE=/usr/include EXPAT_LIBPATH=%{_libdir} REGEX_FLAGS="--with-i export PYTHON_FLAGS # Set PATH, MANPATH and LD_LIBRARY_PATH %if %build_mpi -source /var/mpi-selector/data/$(cat /etc/sysconfig/mpi-selector).sh +source /var/mpi-selector/data/$(rpm --qf "%{VERSION}" -q openmpi).sh %endif %{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam \ --prefix=%{buildroot}%{_prefix} \ @@ -613,6 +613,9 @@ find %{buildroot}%{_docdir} -name \*.py -exec chmod -x {} + %doc %{_mandir}/man7/*.7.gz %changelog +* Mon Mar 16 2009 pth@suse.de +- Don't rely on system default mpi implementation being set. This + fixes building boost on systems before openSUSE 11.0. * Tue Mar 03 2009 pth@suse.de - Fix misplaced ifdef in template_function.hpp:move_assign. Fixes building software that defines BOOST_NO_EXCEPTION (bnc#479659). diff --git a/boost.spec.in b/boost.spec.in index ab56479..360f86b 100644 --- a/boost.spec.in +++ b/boost.spec.in @@ -376,7 +376,7 @@ EOF # Set PATH, MANPATH and LD_LIBRARY_PATH %if %build_mpi -source /var/mpi-selector/data/$(cat /etc/sysconfig/mpi-selector).sh +source /var/mpi-selector/data/$(rpm --qf "%{VERSION}" -q openmpi).sh %endif %{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam cflags="%{optflags}" cxxflags="%{optflags}" stage || (echo "Not all Boost libraries built properly."; exit 1) @@ -409,7 +409,7 @@ export PYTHON_FLAGS # Set PATH, MANPATH and LD_LIBRARY_PATH %if %build_mpi -source /var/mpi-selector/data/$(cat /etc/sysconfig/mpi-selector).sh +source /var/mpi-selector/data/$(rpm --qf "%{VERSION}" -q openmpi).sh %endif %{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam \