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
This commit is contained in:
Pavol Rusnak 2010-05-25 12:33:36 +00:00 committed by Git OBS Bridge
parent 1955444436
commit e8423dbbc8
2 changed files with 16 additions and 3 deletions

View File

@ -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 Thu May 20 08:14:41 UTC 2010 - bg@novell.com

View File

@ -34,6 +34,12 @@
%define build_mpi 1 %define build_mpi 1
%endif %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} %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 %if %build_mpi
@ -427,7 +433,9 @@ fi
#if [ $J_P -gt $J_I ]; then #if [ $J_P -gt $J_I ]; then
# JOBS=$J_G # JOBS=$J_G
#fi #fi
%if %{disable_long_double}
export LONG_DOUBLE_FLAGS="--disable-long-double"
%endif
BJAM_CONFIG="-d2 -j$JOBS -sICU_PATH=%{_prefix}" BJAM_CONFIG="-d2 -j$JOBS -sICU_PATH=%{_prefix}"
PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION" 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 source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
%endif %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) (echo "Not all Boost libraries built properly."; exit 1)
%if %build_docs %if %build_docs
@ -503,7 +511,7 @@ export PYTHON_FLAGS
source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
%endif %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} \ --prefix=%{buildroot}%{_prefix} \
--exec-prefix=$%{buildroot}%{_prefix} \ --exec-prefix=$%{buildroot}%{_prefix} \
--libdir=%{buildroot}%{_libdir} \ --libdir=%{buildroot}%{_libdir} \