SPECS: boost.spec - basic update to 1.34.0 (builds and install), T...
pluto
pluto at pld-linux.org
Fri Jun 15 14:09:32 CEST 2007
Author: pluto Date: Fri Jun 15 12:09:32 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- basic update to 1.34.0 (builds and install), TODO updated, release 0.1.
---- Files affected:
SPECS:
boost.spec (1.86 -> 1.87)
---- Diffs:
================================================================
Index: SPECS/boost.spec
diff -u SPECS/boost.spec:1.86 SPECS/boost.spec:1.87
--- SPECS/boost.spec:1.86 Mon May 21 19:42:01 2007
+++ SPECS/boost.spec Fri Jun 15 14:09:27 2007
@@ -1,8 +1,8 @@
# $Revision$, $Date$
#
# TODO:
-# - /usr/include/boost/detail/atomic_cont_gcc.hpp includes bits/atomicity.h
-# but new libstdc++ has ext/atomicity.h
+# - review python fixes.
+# - add new subpackages and update files.
#
# Conditional build:
%bcond_without python # without boost-python support
@@ -11,15 +11,14 @@
Summary: The Boost C++ Libraries
Summary(pl.UTF-8): Biblioteki C++ "Boost"
Name: boost
-Version: 1.33.1
-Release: 10
+Version: 1.34.0
+Release: 0.1
License: Boost Software License and others
Group: Libraries
Source0: http://dl.sourceforge.net/boost/%{name}_%{_fver}.tar.bz2
-# Source0-md5: 2b999b2fb7798e1737d1fff8fac602ef
-Patch0: %{name}-python.patch
-Patch1: %{name}-archive_iterator_segv.patch
-Patch2: %{name}-atomicity.patch
+# Source0-md5: ed5b9291ffad776f8757a916e1726ad0
+Patch0: %{name}-atomicity.patch
+#Patch1: %{name}-python.patch
URL: http://www.boost.org/
BuildRequires: boost-jam >= 3.1.3
BuildRequires: bzip2-devel
@@ -658,13 +657,15 @@
%prep
%setup -q -n %{name}_%{_fver}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-
-# don't know how to pass it through (b)jam -s (no way?)
-# due to oversophisticated build flags system
-%{__perl} -pi -e 's/ -O3 / %{rpmcxxflags} /' tools/build/v1/gcc-tools.jam
+%patch0 -p0
+#patch1 -p1
+
+# - don't know how to pass it through (b)jam -s (no way?)
+# due to oversophisticated build flags system.
+# - pass -fPIC due to <shared-linkable> removal.
+%{__perl} -pi -e 's/ -O3 / %{rpmcxxflags} -fPIC /' tools/build/v2/tools/gcc.jam
+# - we pass debug flags in cxxflags, so remove hardcoded -g.
+%{__perl} -pi -e 's/ -g / -gdwarf-2 -g2 /' tools/build/v2/tools/gcc.jam
%ifarch alpha
# -pthread gcc parameter doesn't add _REENTRANT to cpp macros on alpha (only)
@@ -682,13 +683,11 @@
PYTHON_VERSION=
%endif
bjam \
- -d2 \
- -sGXX="%{__cxx}" \
- -sGCC="%{__cc}" \
- -sHAVE_ICU=1 -sICU_PATH=/usr \
- -sBUILD="release <threading>multi <shared-linkable>true <inlining>on <debug-symbols>on" \
- -sPYTHON_ROOT=$PYTHON_ROOT \
- -sPYTHON_VERSION=$PYTHON_VERSION
+ -d2 --toolset=gcc \
+ variant=release threading=multi inlining=on debug-symbols=on
+
+# -sPYTHON_ROOT=$PYTHON_ROOT \
+# -sPYTHON_VERSION=$PYTHON_VERSION
%install
rm -rf $RPM_BUILD_ROOT
@@ -696,25 +695,21 @@
cp -rf boost $RPM_BUILD_ROOT%{_includedir}
-install bin/boost/libs/*/build/*.a/*/release/inlining-on/shared-linkable-true/*/lib*.a $RPM_BUILD_ROOT%{_libdir}
-install bin/boost/libs/*/build/*.so/*/release/inlining-on/shared-linkable-true/*/lib*.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
-# use cp -d, install follows symlinks instead of preserving them!
-cp -df bin/boost/libs/*/build/*.so/*/release/inlining-on/shared-linkable-true/*/lib*.so $RPM_BUILD_ROOT%{_libdir}
+install bin.v2/libs/*/build/gcc-*/release/debug-symbols-on/inlining-on/link-static/threading-multi/lib*.a $RPM_BUILD_ROOT%{_libdir}
+install bin.v2/libs/*/build/gcc-*/release/debug-symbols-on/inlining-on/threading-multi/lib*.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
-# create symlinks without -gcc-mt-* things in names
-for f in $RPM_BUILD_ROOT%{_libdir}/*.so.*; do
+# create symlinks without -gcc42-mt-* things in names
+for f in $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.*; do
[ -f "$f" ] || continue
f=$(basename "$f")
- soname=$(basename "$f" | sed -e 's#-gcc-mt-.*#.so#g')
-
- ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/${soname}"
+ soname=$(basename "$f" | sed -e 's#-gcc42-mt-.*#.so#g')
+ ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/$soname"
done
for f in $RPM_BUILD_ROOT%{_libdir}/*.a; do
[ -f "$f" ] || continue
f=$(basename "$f")
- soname=$(basename "$f" | sed -e 's#-gcc-mt-.*#.a#g')
-
- ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/${soname}"
+ soname=$(basename "$f" | sed -e 's#-gcc42-mt-.*#.a#g')
+ ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/$soname"
done
# documentation
@@ -890,7 +885,6 @@
%{_includedir}/boost/noncopyable.hpp
%{_includedir}/boost/nondet_random.hpp
%{_includedir}/boost/none.hpp
-%{_includedir}/boost/none_t.hpp
%{_includedir}/boost/non_type.hpp
%dir %{_includedir}/boost/numeric
%{_includedir}/boost/numeric/interval*
@@ -1085,13 +1079,11 @@
%files test
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_prg_exec_monitor*.so.*.*.*
-%attr(755,root,root) %{_libdir}/libboost_test_exec_monitor*.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_unit_test_framework*.so.*.*.*
%files test-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_prg_exec_monitor*.so
-%attr(755,root,root) %{_libdir}/libboost_test_exec_monitor*.so
%attr(755,root,root) %{_libdir}/libboost_unit_test_framework*.so
%{_includedir}/boost/test
@@ -1135,6 +1127,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.87 2007/06/15 12:09:27 pluto
+- basic update to 1.34.0 (builds and install), TODO updated, release 0.1.
+
Revision 1.86 2007/05/21 17:42:01 pluto
- release 10 for rebuild with gcc-4.2.0 / glibcxx-3.4.9 issue.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/boost.spec?r1=1.86&r2=1.87&f=u
More information about the pld-cvs-commit
mailing list