From e8423dbbc8a93542c49b8a89d0240b3f641f60d457b9083c7ab260c2f4ab0bbf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 25 May 2010 12:33:36 +0000 Subject: [PATCH] Accepting request 40583 from home:azouhr:branches:devel:libraries:c_c++ Copy from home:azouhr:branches:devel:libraries:c_c++/boost via accept of submit request 40583 revision 3. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40583 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=26 --- boost.changes | 5 +++++ boost.spec | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/boost.changes b/boost.changes index 6fe00db..5985a88 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 24 11:54:28 UTC 2010 - bg@novell.com + +- disable long double support for hppa + ------------------------------------------------------------------- Thu May 20 08:14:41 UTC 2010 - bg@novell.com diff --git a/boost.spec b/boost.spec index 25a8d63..2fd2d0c 100644 --- a/boost.spec +++ b/boost.spec @@ -34,6 +34,12 @@ %define build_mpi 1 %endif +%ifarch hppa +%define disable_long_double 1 +%else +%define disable_long_double 0 +%endif + %define most_libs libboost_date_time%{lib_appendix} libboost_filesystem%{lib_appendix} libboost_graph%{lib_appendix} libboost_iostreams%{lib_appendix} libboost_math%{lib_appendix} libboost_test%{lib_appendix} libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_serialization%{lib_appendix} libboost_signals%{lib_appendix} libboost_system%{lib_appendix} libboost_thread%{lib_appendix} libboost_wave%{lib_appendix} libboost_regex%{lib_appendix} %if %build_mpi @@ -427,7 +433,9 @@ fi #if [ $J_P -gt $J_I ]; then # JOBS=$J_G #fi - +%if %{disable_long_double} +export LONG_DOUBLE_FLAGS="--disable-long-double" +%endif BJAM_CONFIG="-d2 -j$JOBS -sICU_PATH=%{_prefix}" PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION" @@ -464,7 +472,7 @@ EOF source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh %endif -%{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam cflags="%{optflags}" cxxflags="%{optflags}" stage || \ +%{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam ${LONG_DOUBLE_FLAGS} cflags="%{optflags}" cxxflags="%{optflags}" stage || \ (echo "Not all Boost libraries built properly."; exit 1) %if %build_docs @@ -503,7 +511,7 @@ export PYTHON_FLAGS source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh %endif -%{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam \ +%{_bindir}/bjam ${BJAM_CONFIG} ${LONG_DOUBLE_FLAGS} --user-config=user-config.jam \ --prefix=%{buildroot}%{_prefix} \ --exec-prefix=$%{buildroot}%{_prefix} \ --libdir=%{buildroot}%{_libdir} \