Accepting request 228393 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/228393
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=89

boost.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Apr  1 08:20:21 UTC 2014 - coolo@suse.com
+
+- buildignore python, python-base is enough
+
+-------------------------------------------------------------------
+Tue Mar 11 12:04:13 UTC 2014 - Rene.vanPaassen@gmail.com
+
+- further improved the use of supplied b2 / bootstrap.sh,
+  include user-config.jam, and remove superfluous python
+  and gcc instructions from user-config.jam 
+
+-------------------------------------------------------------------
+Mon Mar 10 16:26:29 UTC 2014 - Rene.vanPaassen@gmail.com
+
+- fix problem with executable .pdf in doc by correcting
+  permissions after install (%attr with a dir failed on 
+  sled/sles) 
+- add dependency on zlib-devel and libbz2-devel and use the 
+  supplied bootstrap.sh script in building. This adds 
+  on-the-fly compression to boost-iostreams
+
 -------------------------------------------------------------------
 Thu Feb 27 06:13:01 UTC 2014 - coolo@suse.com
 

boost.spec

@@ -66,7 +66,6 @@
 %endif
 
 Name:           boost
-BuildRequires:  boost-jam >= 3.1.19
 BuildRequires:  chrpath
 BuildRequires:  dos2unix
 BuildRequires:  gcc-c++
@@ -75,6 +74,8 @@ BuildRequires:  libexpat-devel
 BuildRequires:  libicu-devel >= 4.4
 BuildRequires:  python-devel
 BuildRequires:  xorg-x11-devel
+#!BuildIgnore:  python
+BuildRequires:  zlib-devel
 %if %build_mpi
 BuildRequires:  openmpi-devel
 %endif
@@ -83,7 +84,6 @@ BuildRequires:  docbook
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  doxygen
 BuildRequires:  libxslt-tools
-BuildRequires:  python-devel
 BuildRequires:  texlive-latex
 %endif
 %if 0%suse_version > 1020
@@ -442,7 +442,7 @@ find . -name \*.orig -exec rm {} +
 find . -type f -exec chmod u+w {} +
 
 # Create shared build instructions
-cat > .build <<\EOF
+cat << EOF >.build 
 # Now build it
 J_P=%{jobs}
 J_G=$(getconf _NPROCESSORS_ONLN)
@@ -483,18 +483,21 @@ LIBRARIES_FLAGS+=" --without-context --without-coroutine"
 %endif
 EOF
 
-cat << EOF >user-config.jam
+# Read shared build instructions
-# Boost.Build Configuration
+. ./.build
 
-# Compiler configuration
+# Set PATH, MANPATH and LD_LIBRARY_PATH for mpi
-using gcc ;
+source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
 
-# Python configuration
+# use supplied bootstrap.sh instead of mucking with old bjam
-using python : ${PYTHON_VERSION} : %{_prefix} ;
+# see also: https://svn.boost.org/trac/boost/ticket/9304
-EOF
+./bootstrap.sh --with-libraries=all \
+    --prefix=%{_prefix} --exec-prefix=%{_bindir} \
+    --libdir=%{_libdir} --includedir=%{_includedir}
 
+# add specific wishes in user-config.jam
 %if %build_docs
-cat << EOF >>user-config.jam
+cat << EOF >user-config.jam
 using xsltproc ;
 
 using boostbook : /usr/share/xml/docbook/stylesheet/nwalsh/current ;
@@ -507,41 +510,32 @@ EOF
 cat << EOF >>user-config.jam
 using mpi ;
 EOF
-
-cat >> .build <<\EOF
-# Set PATH, MANPATH and LD_LIBRARY_PATH
-source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
-EOF
 %endif
 
-# Read shared build instructions
+# perform the compilation
-. ./.build
+./b2 --prefix=%{_prefix} --libdir=%{_libdir} --user-config=./user-config.jam
-
-%{_bindir}/bjam ${BJAM_CONFIG} ${LONG_DOUBLE_FLAGS} ${LIBRARIES_FLAGS} \
-	--user-config=user-config.jam \
-	cflags="%{optflags}" cxxflags="%{optflags} -fno-var-tracking" stage || \
-	(echo "Not all Boost libraries built properly."; exit 1)
 
 %if %build_docs
 cd doc
-%{_bindir}/bjam ${BJAM_CONFIG} --user-config=../user-config.jam --v2 man
+../b2 ${BJAM_CONFIG} --user-config=../user-config.jam --v2 man
 %endif
 
 %install
+
 # Read shared build instructions
 . ./.build
 
-%{_bindir}/bjam ${BJAM_CONFIG} ${LONG_DOUBLE_FLAGS} ${LIBRARIES_FLAGS} \
+# Set PATH, MANPATH and LD_LIBRARY_PATH for mpi
-	--user-config=user-config.jam \
+source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
-	--prefix=%{buildroot}%{_prefix} \
+
-	--exec-prefix=$%{buildroot}%{_prefix} \
+./b2 install \
-	--libdir=%{buildroot}%{_libdir} \
+    --prefix=%{buildroot}%{_prefix} --exec-prefix=%{buildroot}%{_bindir} \
-	--includedir=%{buildroot}%{_includedir} \
+    --libdir=%{buildroot}%{_libdir} --includedir=%{buildroot}%{_includedir} \
-	install || echo "Not all Boost libraries built properly."
+    --user-config=./user-config.jam
 
 # do not install the python module - as long as noone needs it, it requires more fixes
 # see https://bugzilla.redhat.com/show_bug.cgi?id=801534 for details
-rm %{buildroot}%{_libdir}/mpi.so
+rm -f %{buildroot}%{_libdir}/mpi.so
 
 mkdir -p %{buildroot}%{_docdir}
 
@@ -586,6 +580,7 @@ ln -s ../LICENSE_1_0.txt %{buildroot}%{_docdir}/libs
 #cp %%{S:5} %%{buildroot}%%{_docdir}
 #only for documentation, doesn't need to be executable
 find %{buildroot}%{_docdir} -name \*.py -exec chmod -x {} +
+chmod -x ../%{name}_%{file_version}_pdf/*.pdf
 rm -f %{buildroot}%{_libdir}/*.a
 #symlink dupes
 %if 0%suse_version > 1020
@@ -773,7 +768,7 @@ rm -f %{buildroot}%{_libdir}/*.a
 
 %files doc-pdf
 %defattr(-, root, root, -)
-%attr(644,root,root) %doc ../%{name}_%{file_version}_pdf/*.pdf
+%doc ../%{name}_%{file_version}_pdf/*.pdf
 %endif
 
 %changelog