mirror of
https://abf.rosa.ru/djam/boost.git
synced 2025-04-11 08:44:17 +00:00
New version 1.55.0 (just sync for now, complete package re-work in required anyway)
This commit is contained in:
parent
fe50fe5a2c
commit
ca1821acb4
5 changed files with 313 additions and 399 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
"boost_1_50_0.tar.bz2": ee06f89ed472cf369573f8acf9819fbc7173344e
|
||||
boost_1_55_0.tar.bz2: cef9a0cc7084b1d639e06cd3bc34e4251524c840
|
||||
|
|
|
@ -1,27 +1,46 @@
|
|||
diff -urp boost_1_48_0~/boost/asio/buffers_iterator.hpp boost_1_48_0/boost/asio/buffers_iterator.hpp
|
||||
--- boost_1_48_0~/boost/asio/buffers_iterator.hpp 2012-01-16 16:15:26.550239797 +0100
|
||||
+++ boost_1_48_0/boost/asio/buffers_iterator.hpp 2012-01-16 16:17:45.880243120 +0100
|
||||
@@ -128,7 +128,7 @@ public:
|
||||
/// Construct an iterator representing the beginning of the buffers' data.
|
||||
static buffers_iterator begin(const BufferSequence& buffers)
|
||||
#if BOOST_WORKAROUND(__GNUC__, == 4) && BOOST_WORKAROUND(__GNUC_MINOR__, == 3)
|
||||
- __attribute__ ((noinline))
|
||||
+ __attribute__ ((__noinline__))
|
||||
Index: boost/random/detail/integer_log2.hpp
|
||||
===================================================================
|
||||
--- boost/random/detail/integer_log2.hpp
|
||||
+++ boost/random/detail/integer_log2.hpp 2012-12-19 22:47:06.840170611 +0100
|
||||
@@ -27,7 +27,7 @@
|
||||
#elif defined(BOOST_MSVC)
|
||||
#define BOOST_RANDOM_DETAIL_CONSTEXPR __forceinline
|
||||
#elif defined(__GNUC__) && __GNUC__ >= 4
|
||||
-#define BOOST_RANDOM_DETAIL_CONSTEXPR inline __attribute__((const)) __attribute__((always_inline))
|
||||
+#define BOOST_RANDOM_DETAIL_CONSTEXPR inline __attribute__((__const__)) __attribute__((__always_inline__))
|
||||
#else
|
||||
#define BOOST_RANDOM_DETAIL_CONSTEXPR inline
|
||||
#endif
|
||||
{
|
||||
buffers_iterator new_iter;
|
||||
@@ -148,7 +148,7 @@ public:
|
||||
/// Construct an iterator representing the end of the buffers' data.
|
||||
static buffers_iterator end(const BufferSequence& buffers)
|
||||
#if BOOST_WORKAROUND(__GNUC__, == 4) && BOOST_WORKAROUND(__GNUC_MINOR__, == 3)
|
||||
- __attribute__ ((noinline))
|
||||
+ __attribute__ ((__noinline__))
|
||||
Index: boost/optional/optional.hpp
|
||||
===================================================================
|
||||
--- boost/optional/optional.hpp
|
||||
+++ boost/optional/optional.hpp 2012-12-19 22:45:59.330989045 +0100
|
||||
@@ -127,7 +127,7 @@
|
||||
union
|
||||
// This works around GCC warnings about breaking strict aliasing rules when casting storage address to T*
|
||||
#if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS)
|
||||
- __attribute__((may_alias))
|
||||
+ __attribute__((__may_alias__))
|
||||
#endif
|
||||
{
|
||||
buffers_iterator new_iter;
|
||||
diff -urp boost_1_48_0~/boost/config/compiler/gcc.hpp boost_1_48_0/boost/config/compiler/gcc.hpp
|
||||
--- boost_1_48_0~/boost/config/compiler/gcc.hpp 2012-01-16 16:15:14.643239525 +0100
|
||||
+++ boost_1_48_0/boost/config/compiler/gcc.hpp 2012-01-16 16:21:24.072247987 +0100
|
||||
dummy_u
|
||||
{
|
||||
Index: boost/gil/gil_config.hpp
|
||||
===================================================================
|
||||
--- boost/gil/gil_config.hpp
|
||||
+++ boost/gil/gil_config.hpp 2012-12-19 22:44:36.447990911 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
#if defined(_MSC_VER)
|
||||
# define GIL_FORCEINLINE __forceinline
|
||||
#elif defined(__GNUC__) && __GNUC__ > 3
|
||||
-# define GIL_FORCEINLINE inline __attribute__ ((always_inline))
|
||||
+# define GIL_FORCEINLINE inline __attribute__ ((__always_inline__))
|
||||
#else
|
||||
# define GIL_FORCEINLINE inline
|
||||
#endif
|
||||
Index: boost/config/compiler/gcc.hpp
|
||||
===================================================================
|
||||
--- boost/config/compiler/gcc.hpp
|
||||
+++ boost/config/compiler/gcc.hpp 2012-12-19 22:43:59.054442767 +0100
|
||||
@@ -120,13 +120,13 @@
|
||||
// _WIN32 or one of its variant spellings. Note that Cygwin is a POSIX environment,
|
||||
// so does not define _WIN32 or its variants.
|
||||
|
@ -40,51 +59,3 @@ diff -urp boost_1_48_0~/boost/config/compiler/gcc.hpp boost_1_48_0/boost/config/
|
|||
#else
|
||||
// config/platform/win32.hpp will define BOOST_SYMBOL_EXPORT, etc., unless already defined
|
||||
# define BOOST_SYMBOL_EXPORT
|
||||
diff -urp boost_1_48_0~/boost/gil/gil_config.hpp boost_1_48_0/boost/gil/gil_config.hpp
|
||||
--- boost_1_48_0~/boost/gil/gil_config.hpp 2012-01-16 16:15:29.883239865 +0100
|
||||
+++ boost_1_48_0/boost/gil/gil_config.hpp 2012-01-16 16:17:49.096243036 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
#if defined(_MSC_VER)
|
||||
# define GIL_FORCEINLINE __forceinline
|
||||
#elif defined(__GNUC__) && __GNUC__ > 3
|
||||
-# define GIL_FORCEINLINE inline __attribute__ ((always_inline))
|
||||
+# define GIL_FORCEINLINE inline __attribute__ ((__always_inline__))
|
||||
#else
|
||||
# define GIL_FORCEINLINE inline
|
||||
#endif
|
||||
diff -urp boost_1_48_0~/boost/optional/optional.hpp boost_1_48_0/boost/optional/optional.hpp
|
||||
--- boost_1_48_0~/boost/optional/optional.hpp 2012-01-16 16:15:29.743239804 +0100
|
||||
+++ boost_1_48_0/boost/optional/optional.hpp 2012-01-16 16:17:47.488242994 +0100
|
||||
@@ -127,7 +127,7 @@ class aligned_storage
|
||||
union
|
||||
// This works around GCC warnings about breaking strict aliasing rules when casting storage address to T*
|
||||
#if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS)
|
||||
- __attribute__((may_alias))
|
||||
+ __attribute__((__may_alias__))
|
||||
#endif
|
||||
dummy_u
|
||||
{
|
||||
diff -urp boost_1_48_0~/boost/random/detail/integer_log2.hpp boost_1_48_0/boost/random/detail/integer_log2.hpp
|
||||
--- boost_1_48_0~/boost/random/detail/integer_log2.hpp 2012-01-16 16:15:24.962239810 +0100
|
||||
+++ boost_1_48_0/boost/random/detail/integer_log2.hpp 2012-01-16 16:17:44.104242884 +0100
|
||||
@@ -27,7 +27,7 @@ namespace detail {
|
||||
#elif defined(BOOST_MSVC)
|
||||
#define BOOST_RANDOM_DETAIL_CONSTEXPR __forceinline
|
||||
#elif defined(__GNUC__) && __GNUC__ >= 4
|
||||
-#define BOOST_RANDOM_DETAIL_CONSTEXPR __attribute__((const)) __attribute__((always_inline))
|
||||
+#define BOOST_RANDOM_DETAIL_CONSTEXPR __attribute__((__const__)) __attribute__((__always_inline__))
|
||||
#else
|
||||
#define BOOST_RANDOM_DETAIL_CONSTEXPR inline
|
||||
#endif
|
||||
diff -urp boost_1_48_0~/boost/xpressive/detail/core/adaptor.hpp boost_1_48_0/boost/xpressive/detail/core/adaptor.hpp
|
||||
--- boost_1_48_0~/boost/xpressive/detail/core/adaptor.hpp 2012-01-16 16:15:32.315239932 +0100
|
||||
+++ boost_1_48_0/boost/xpressive/detail/core/adaptor.hpp 2012-01-16 16:17:54.024243179 +0100
|
||||
@@ -41,7 +41,7 @@ struct xpression_adaptor
|
||||
&& ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
|
||||
// Ugh, gcc has an optimizer bug which elides this c'tor call
|
||||
// resulting in pure virtual function calls.
|
||||
- __attribute__((noinline))
|
||||
+ __attribute__((__noinline__))
|
||||
#endif
|
||||
: xpr_(xpr)
|
||||
{
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
--- /usr/include/boost/polygon/polygon.hpp.orig 2012-01-26 01:05:15.934998805 +0800
|
||||
+++ /usr/include/boost/polygon/polygon.hpp 2012-01-26 01:13:10.547000000 +0800
|
||||
@@ -24,6 +24,8 @@
|
||||
|
||||
#include "transform.hpp"
|
||||
#include "detail/transform_detail.hpp"
|
||||
|
||||
+#include "detail/polygon_sort_adaptor.hpp"
|
||||
+
|
||||
|
|
2
boost.rpmlintrc
Normal file
2
boost.rpmlintrc
Normal file
|
@ -0,0 +1,2 @@
|
|||
# For examples in boost-build
|
||||
addFilter("E: devel-file-in-non-devel-package")
|
595
boost.spec
595
boost.spec
|
@ -1,10 +1,11 @@
|
|||
%define packver %(echo "%{version}" | sed -e "s/\\\./_/g")
|
||||
|
||||
# From the version 13 of Fedora, the Boost libraries are delivered
|
||||
# with sonames equal to the Boost version (e.g., 1.41.0).
|
||||
%define libname %mklibname boost %{version}
|
||||
%define libnamedevel %mklibname boost -d
|
||||
%define libnamestaticdevel %mklibname boost -d -s
|
||||
%define coredevel %mklibname boost-core -d
|
||||
%ifarch aarch64
|
||||
%bcond_with context
|
||||
%endif
|
||||
|
||||
# --no-undefined breaks build of CMakeified Boost.{Chrono,Locale,Timer}.
|
||||
# Without --no-undefined, corresponding libraries lose their dependency on Boost.System.
|
||||
|
@ -13,19 +14,13 @@
|
|||
|
||||
Summary: Portable C++ libraries
|
||||
Name: boost
|
||||
Version: 1.50.0
|
||||
Release: 5
|
||||
Version: 1.55.0
|
||||
Release: 2
|
||||
License: Boost
|
||||
Group: Development/C++
|
||||
URL: http://boost.org/
|
||||
Source0: http://sourceforge.net/projects/boost/files/boost/%{version}/boost_%(echo %version |sed -e 's,\.,_,g').tar.bz2
|
||||
|
||||
# Upstream patch to fixes a bug when compiled using a C++11 compiler
|
||||
Patch0: http://www.boost.org/patches/1_50_0/001-unordered.patch
|
||||
|
||||
# The patch may break c++03, and there is therefore no plan yet to include
|
||||
# it upstream: https://svn.boost.org/trac/boost/ticket/4999
|
||||
Patch2: boost-1.50.0-signals-erase.patch
|
||||
Url: http://boost.org/
|
||||
Source0: http://download.sourceforge.net/boost/boost_%{packver}.tar.bz2
|
||||
Source100: %{name}.rpmlintrc
|
||||
|
||||
# https://svn.boost.org/trac/boost/ticket/6150
|
||||
Patch4: boost-1.50.0-fix-non-utf8-files.patch
|
||||
|
@ -38,14 +33,6 @@ Patch5: boost-1.48.0-add-bjam-man-page.patch
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=756005
|
||||
# https://svn.boost.org/trac/boost/ticket/6131
|
||||
Patch7: boost-1.50.0-foreach.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=781859
|
||||
# The following tickets have still to be fixed by upstream.
|
||||
# https://svn.boost.org/trac/boost/ticket/6406 fixed, but only in Boost-1.51.0
|
||||
# https://svn.boost.org/trac/boost/ticket/6408
|
||||
# https://svn.boost.org/trac/boost/ticket/6410
|
||||
# https://svn.boost.org/trac/boost/ticket/6413
|
||||
# https://svn.boost.org/trac/boost/ticket/6415
|
||||
Patch9: boost-1.50.0-attribute.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=783660
|
||||
# https://svn.boost.org/trac/boost/ticket/6459 fixed
|
||||
|
@ -58,13 +45,13 @@ Patch12: boost-1.50.0-polygon.patch
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=828857
|
||||
Patch15: boost-1.50.0-pool.patch
|
||||
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: xsltproc
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: icu-devel >= 49.0
|
||||
#BuildRequires: openmpi-devel
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: doxygen xsltproc
|
||||
BuildRequires: pkgconfig(expat)
|
||||
BuildRequires: pkgconfig(icu-uc)
|
||||
BuildRequires: pkgconfig(python)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
%description
|
||||
Boost is a collection of free peer-reviewed portable C++ source
|
||||
|
@ -72,12 +59,22 @@ libraries. The emphasis is on libraries which work well with the C++
|
|||
Standard Library. This package contains only the shared libraries
|
||||
needed for running programs using Boost.
|
||||
|
||||
|
||||
%ifarch %arm %mips
|
||||
%define boostlibs date_time filesystem graph iostreams math_c99 math_c99f math_tr1 math_tr1f prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random chrono locale timer
|
||||
%else
|
||||
%define boostlibs date_time filesystem graph iostreams math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random chrono locale timer
|
||||
%endif
|
||||
# build section Taken from the Fedora .src.rpm.
|
||||
%package build
|
||||
Summary: Cross platform build system for C++ projects
|
||||
Group: Development/C++
|
||||
Requires: boost-jam
|
||||
BuildArch: noarch
|
||||
|
||||
%description build
|
||||
Boost.Build is an easy way to build C++ projects, everywhere. You name
|
||||
your pieces of executable and libraries and list their sources. Boost.Build
|
||||
takes care about compiling your sources with the right options,
|
||||
creating static and shared libraries, making pieces of executable, and other
|
||||
chores -- whether you're using GCC, MSVC, or a dozen more supported
|
||||
C++ compilers -- on Windows, OSX, Linux and commercial UNIX systems.
|
||||
|
||||
%define boostlibs chrono coroutine date_time filesystem graph iostreams locale log math prg_exec_monitor program_options python random regex serialization signals system thread timer unit_test_framework wave wserialization context atomic
|
||||
|
||||
# (Anssi 01/2010) dashes are converted to underscores for macros ($lib2);
|
||||
# The sed script adds _ when library name ends in number.
|
||||
|
@ -102,16 +99,89 @@ EOF
|
|||
done)}
|
||||
%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
|
||||
%%files -n %%{libname$lib2}
|
||||
%%defattr(-,root,root)
|
||||
%%doc LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_$lib.so.%{version}
|
||||
%{_libdir}/libboost_$lib*.so.%{version}
|
||||
EOF
|
||||
done)}
|
||||
|
||||
%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
|
||||
%%global devname$lib2 %%mklibname -d boost_$(echo $lib | sed 's,[0-9]$,&_,')
|
||||
%%package -n %%{devname$lib2}
|
||||
Summary: Development files for Boost $lib
|
||||
Group: Development/C++
|
||||
Provides: boost-$lib-devel = %EVRD
|
||||
Requires: %{libname$lib2} = %EVRD
|
||||
Requires: %{coredevel} = %EVRD
|
||||
EOF
|
||||
done)}
|
||||
# (Anssi 01/2010) splitted expand contents due to rpm bug failing build,
|
||||
# triggered by a too long expanded string.
|
||||
%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
|
||||
%%description -n %%{devname$lib2}
|
||||
Boost is a collection of free peer-reviewed portable C++ source
|
||||
libraries. The emphasis is on libraries which work well with the C++
|
||||
Standard Library. This package contains the shared library needed for
|
||||
running programs dynamically linked against Boost $lib.
|
||||
EOF
|
||||
done)}
|
||||
%{expand:%(for lib in %boostlibs; do lib2=${lib/-/_}; cat <<EOF
|
||||
%%files -n %%{devname$lib2}
|
||||
%optional %{_libdir}/libboost_$lib*.so
|
||||
%optional %{_includedir}/boost/$lib
|
||||
%optional %{_includedir}/boost/$lib.h
|
||||
%optional %{_includedir}/boost/$lib.hpp
|
||||
%optional %{_includedir}/boost/${lib}_fwd.hpp
|
||||
%if "$lib2" == "unit_test_framework"
|
||||
%{_includedir}/boost/test
|
||||
%endif
|
||||
EOF
|
||||
done)}
|
||||
|
||||
%define develonly accumulators algorithm archive asio assign attributes bimap bind circular_buffer container dynamic_bitset exception flyweight format function functional fusion geometry integer mpi mpl msm multi_array multi_index multiprecision optional parameter phoenix predef preprocessor range ratio signals2 smart_ptr spirit tr1 tti tuple type_erasure type_traits units unordered utility uuid variant xpressive
|
||||
|
||||
%{expand:%(for lib in %develonly; do lib2=${lib/-/_}; cat <<EOF
|
||||
%%global devname$lib2 %%mklibname -d boost_$(echo $lib | sed 's,[0-9]$,&_,')
|
||||
%%package -n %%{devname$lib2}
|
||||
Summary: Development files for Boost $lib
|
||||
Group: Development/C++
|
||||
Provides: boost-$lib-devel = %EVRD
|
||||
Requires: %{coredevel} = %EVRD
|
||||
EOF
|
||||
done)}
|
||||
# (Anssi 01/2010) splitted expand contents due to rpm bug failing build,
|
||||
# triggered by a too long expanded string.
|
||||
%{expand:%(for lib in %develonly; do lib2=${lib/-/_}; cat <<EOF
|
||||
%%description -n %%{devname$lib2}
|
||||
Boost is a collection of free peer-reviewed portable C++ source
|
||||
libraries. The emphasis is on libraries which work well with the C++
|
||||
Standard Library. This package contains the shared library needed for
|
||||
running programs dynamically linked against Boost $lib.
|
||||
EOF
|
||||
done)}
|
||||
%{expand:%(for lib in %develonly; do lib2=${lib/-/_}; cat <<EOF
|
||||
%%files -n %%{devname$lib2}
|
||||
%optional %{_includedir}/boost/$lib
|
||||
%optional %{_includedir}/boost/$lib.h
|
||||
%optional %{_includedir}/boost/$lib.hpp
|
||||
%optional %{_includedir}/boost/${lib}_fwd.hpp
|
||||
%if "$lib" == "unordered"
|
||||
%{_includedir}/boost/unordered_map.hpp
|
||||
%{_includedir}/boost/unordered_set.hpp
|
||||
%endif
|
||||
EOF
|
||||
done)}
|
||||
|
||||
%package -n %{coredevel}
|
||||
Summary: Core development files needed by all or most Boost components
|
||||
Group: Development/C++
|
||||
|
||||
%description -n %{coredevel}
|
||||
Core development files needed by all or most Boost components
|
||||
|
||||
%package -n %{libnamedevel}
|
||||
Summary: The libraries and headers needed for Boost development
|
||||
Group: Development/C++
|
||||
Requires: %{expand:%(for lib in %boostlibs; do echo -n "%%{libname${lib/-/_}} = %{version}-%{release} "; done)}
|
||||
Requires: %{expand:%(for lib in %boostlibs %develonly; do echo -n "%%{devname${lib/-/_}} = %{version}-%{release} "; done)}
|
||||
Obsoletes: %{mklibname boost 1}-devel < %{version}-%{release}
|
||||
Provides: %{name}-devel = %{version}-%{release}
|
||||
Provides: lib%{name}-devel = %{version}-%{release}
|
||||
|
@ -122,14 +192,16 @@ libraries. The emphasis is on libraries which work well with the C++
|
|||
Standard Library. This package contains headers and shared library
|
||||
symlinks needed for Boost development.
|
||||
|
||||
%package -n %{libnamedevel}-doc
|
||||
Summary: The libraries and headers needed for Boost development
|
||||
Group: Development/C++
|
||||
Provides: %{name}-devel-doc = %{version}-%{release}
|
||||
Conflicts: %{_lib}boost-devel < 1.41.0
|
||||
BuildArch: noarch
|
||||
%package -n %{libnamedevel}-doc
|
||||
Summary: The libraries and headers needed for Boost development
|
||||
Group: Development/C++
|
||||
Conflicts: libboost-devel < 1.41.0
|
||||
Conflicts: lib64boost-devel < 1.41.0
|
||||
Obsoletes: libboost-devel-doc < 1.48.0-2
|
||||
Obsoletes: lib64boost-devel-doc < 1.48.0-2
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n %{libnamedevel}-doc
|
||||
%description -n %{libnamedevel}-doc
|
||||
Boost is a collection of free peer-reviewed portable C++ source
|
||||
libraries. The emphasis is on libraries which work well with the C++
|
||||
Standard Library. This package contains documentation needed for Boost
|
||||
|
@ -148,13 +220,12 @@ libraries. The emphasis is on libraries which work well with the C++
|
|||
Standard Library. This package contains only the static libraries
|
||||
needed for Boost development.
|
||||
|
||||
%package -n %{name}-examples
|
||||
%package examples
|
||||
Summary: The examples for the Boost libraries
|
||||
Group: Development/C++
|
||||
Obsoletes: %{libname}-examples < %{version}-%{release}
|
||||
Provides: %{libname}-examples = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n %{name}-examples
|
||||
%description examples
|
||||
Boost is a collection of free peer-reviewed portable C++ source
|
||||
libraries. The emphasis is on libraries which work well with the C++
|
||||
Standard Library. This package contains examples, installed in the
|
||||
|
@ -162,12 +233,9 @@ same place as the documentation.
|
|||
|
||||
%prep
|
||||
%setup -q -n boost_%{packver}
|
||||
%patch0 -p0
|
||||
%patch2 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch7 -p2
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch12 -p3
|
||||
%patch15 -p0
|
||||
|
@ -183,295 +251,168 @@ mkdir examples
|
|||
find libs -type f \( -name "*.?pp" ! -path "*test*" ! -path "*src*" ! -path "*tools*" -o -path "*example*" \) -exec cp --parents {} examples/ \;
|
||||
|
||||
%build
|
||||
%define boost_jam_common_flags %{_smp_mflags} -d2 --layout=system --toolset=gcc variant=release threading=multi optimization=speed linkflags="%{ldflags} -lpython%{py_ver}" debug-symbols=on -sHAVE_ICU=1 -sEXPAT_INCLUDE=%{_includedir} -sEXPAT_LIBPATH=%{_libdir} -sCXXFLAGS="%{optflags} -O3" link=shared runtime-link=shared
|
||||
%ifnarch %arm %mips
|
||||
%define boost_bjam bjam %{boost_jam_common_flags}
|
||||
%else
|
||||
%define boost_bjam bjam %{boost_jam_common_flags} --disable-long-double
|
||||
%define gcc_ver %(rpm -q --queryformat="%%{VERSION}" gcc)
|
||||
cat > ./tools/build/v2/user-config.jam << EOF
|
||||
using gcc : %gcc_ver : gcc : <cflags>"%optflags -I%{_includedir}/python%{py_ver}" <cxxflags>"%optflags -I%{_includedir}/python%{py_ver}" <linkflags>"%ldflags" ;
|
||||
using python : %py_ver : %{_bindir}/python%{py_ver} : %{_includedir}/python%{py_ver} : %{_libdir} ;
|
||||
EOF
|
||||
./bootstrap.sh --with-toolset=gcc --with-icu --prefix=%{_prefix} --libdir=%{_libdir}
|
||||
./b2 -d+2 -q %{?_smp_mflags} --without-mpi \
|
||||
--prefix=%{_prefix} --libdir=%{_libdir} \
|
||||
%if !%{with context}
|
||||
--without-context --without-coroutine \
|
||||
%endif
|
||||
./bootstrap.sh --prefix=%{_prefix} --libdir=%{_libdir}
|
||||
./%{boost_bjam} --prefix=%{_prefix} --libdir=%{_libdir}
|
||||
linkflags="%{ldflags} -lpython%{py_ver} -lstdc++ -lm" \
|
||||
-sHAVE_ICU=1 \
|
||||
link=shared threading=multi debug-symbols=off --layout=system
|
||||
|
||||
# Taken from the Fedora .src.rpm.
|
||||
echo ============================= build Boost.Build ==================
|
||||
(cd tools/build/v2
|
||||
./bootstrap.sh --with-toolset=gcc)
|
||||
|
||||
%install
|
||||
./b2 -d+2 -q %{?_smp_mflags} --without-mpi \
|
||||
--prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} \
|
||||
%if !%{with context}
|
||||
--without-context --without-coroutine \
|
||||
%endif
|
||||
link=shared \
|
||||
install
|
||||
|
||||
./%{boost_bjam} --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} install
|
||||
|
||||
# (Anssi 01/2010) add compatibility symlinks:
|
||||
for file in %{buildroot}%{_libdir}/*.so; do
|
||||
cp -a $file ${file%.so}-mt.so
|
||||
done
|
||||
for file in %{buildroot}%{_libdir}/*.a; do
|
||||
ln -s $(basename $file) ${file%.a}-mt.a
|
||||
done
|
||||
|
||||
# Kill any debug library versions that may show up un-invited.
|
||||
rm -f %{buildroot}%{_libdir}/*-d.* %{buildroot}%{_libdir}/*-d-mt.*
|
||||
# Remove cmake configuration files used to build the Boost libraries
|
||||
rm -f %{buildroot}%{_libdir}/Boost*.cmake
|
||||
# Fix packaged backup files in examples
|
||||
find . %buildroot -name "*.*~" |xargs rm -f
|
||||
echo ============================= install Boost.Build ==================
|
||||
(cd tools/build/v2
|
||||
./b2 --prefix=%{buildroot}%{_prefix} install
|
||||
# Fix some permissions
|
||||
chmod -x %{buildroot}%{_datadir}/boost-build/build/alias.py
|
||||
chmod +x %{buildroot}%{_datadir}/boost-build/tools/doxproc.py
|
||||
# We don't want to distribute this
|
||||
rm -f %{buildroot}%{_bindir}/b2
|
||||
# Not a real file
|
||||
rm -f %{buildroot}%{_datadir}/boost-build/build/project.ann.py
|
||||
# Empty file
|
||||
rm -f %{buildroot}%{_datadir}/boost-build/tools/doxygen/windows-paths-check.hpp
|
||||
)
|
||||
rm -f %{buildroot}/%{_bindir}/bjam
|
||||
rm -f %{buildroot}/%{_mandir}/man1/bjam.1*
|
||||
|
||||
%files -n %{coredevel}
|
||||
%dir %{_includedir}/boost
|
||||
%{_includedir}/boost/aligned_storage.hpp
|
||||
%{_includedir}/boost/any.hpp
|
||||
%{_includedir}/boost/array.hpp
|
||||
%{_includedir}/boost/assert.hpp
|
||||
%{_includedir}/boost/blank.hpp
|
||||
%{_includedir}/boost/blank_fwd.hpp
|
||||
%{_includedir}/boost/call_traits.hpp
|
||||
%{_includedir}/boost/cast.hpp
|
||||
%{_includedir}/boost/cerrno.hpp
|
||||
%{_includedir}/boost/checked_delete.hpp
|
||||
%{_includedir}/boost/compatibility
|
||||
%{_includedir}/boost/compressed_pair.hpp
|
||||
%{_includedir}/boost/concept
|
||||
%{_includedir}/boost/concept_archetype.hpp
|
||||
%{_includedir}/boost/concept_check.hpp
|
||||
%{_includedir}/boost/concept_check
|
||||
%{_includedir}/boost/config.hpp
|
||||
%{_includedir}/boost/config
|
||||
%{_includedir}/boost/crc.hpp
|
||||
%{_includedir}/boost/cregex.hpp
|
||||
%{_includedir}/boost/cstdint.hpp
|
||||
%{_includedir}/boost/cstdlib.hpp
|
||||
%{_includedir}/boost/current_function.hpp
|
||||
%{_includedir}/boost/detail
|
||||
%{_includedir}/boost/enable_shared_from_this.hpp
|
||||
%{_includedir}/boost/exception_ptr.hpp
|
||||
%{_includedir}/boost/foreach.hpp
|
||||
%{_includedir}/boost/foreach_fwd.hpp
|
||||
%{_includedir}/boost/function_equal.hpp
|
||||
%{_includedir}/boost/function_output_iterator.hpp
|
||||
%{_includedir}/boost/function_types
|
||||
%{_includedir}/boost/generator_iterator.hpp
|
||||
%{_includedir}/boost/get_pointer.hpp
|
||||
%{_includedir}/boost/gil
|
||||
%{_includedir}/boost/heap
|
||||
%{_includedir}/boost/icl
|
||||
%{_includedir}/boost/implicit_cast.hpp
|
||||
%{_includedir}/boost/indirect_reference.hpp
|
||||
%{_includedir}/boost/integer_traits.hpp
|
||||
%{_includedir}/boost/interprocess
|
||||
%{_includedir}/boost/intrusive
|
||||
%{_includedir}/boost/intrusive_ptr.hpp
|
||||
%{_includedir}/boost/io
|
||||
%{_includedir}/boost/io_fwd.hpp
|
||||
%{_includedir}/boost/is_placeholder.hpp
|
||||
%{_includedir}/boost/iterator.hpp
|
||||
%{_includedir}/boost/iterator
|
||||
%{_includedir}/boost/iterator_adaptors.hpp
|
||||
%{_includedir}/boost/lambda
|
||||
%{_includedir}/boost/last_value.hpp
|
||||
%{_includedir}/boost/lexical_cast.hpp
|
||||
%{_includedir}/boost/limits.hpp
|
||||
%{_includedir}/boost/local_function.hpp
|
||||
%{_includedir}/boost/local_function
|
||||
%{_includedir}/boost/lockfree
|
||||
%{_includedir}/boost/logic
|
||||
%{_includedir}/boost/make_shared.hpp
|
||||
%{_includedir}/boost/mem_fn.hpp
|
||||
%{_includedir}/boost/memory_order.hpp
|
||||
%{_includedir}/boost/move
|
||||
%{_includedir}/boost/multi_index_container.hpp
|
||||
%{_includedir}/boost/multi_index_container_fwd.hpp
|
||||
%{_includedir}/boost/next_prior.hpp
|
||||
%{_includedir}/boost/non_type.hpp
|
||||
%{_includedir}/boost/noncopyable.hpp
|
||||
%{_includedir}/boost/nondet_random.hpp
|
||||
%{_includedir}/boost/none.hpp
|
||||
%{_includedir}/boost/none_t.hpp
|
||||
%{_includedir}/boost/numeric
|
||||
%{_includedir}/boost/operators.hpp
|
||||
%{_includedir}/boost/pending
|
||||
%{_includedir}/boost/pointee.hpp
|
||||
%{_includedir}/boost/pointer_cast.hpp
|
||||
%{_includedir}/boost/pointer_to_other.hpp
|
||||
%{_includedir}/boost/polygon
|
||||
%{_includedir}/boost/pool
|
||||
%{_includedir}/boost/progress.hpp
|
||||
%{_includedir}/boost/property_map
|
||||
%{_includedir}/boost/property_tree
|
||||
%{_includedir}/boost/proto
|
||||
%{_includedir}/boost/ptr_container
|
||||
%{_includedir}/boost/rational.hpp
|
||||
%{_includedir}/boost/ref.hpp
|
||||
%{_includedir}/boost/scope_exit.hpp
|
||||
%{_includedir}/boost/scoped_array.hpp
|
||||
%{_includedir}/boost/scoped_ptr.hpp
|
||||
%{_includedir}/boost/shared_array.hpp
|
||||
%{_includedir}/boost/shared_container_iterator.hpp
|
||||
%{_includedir}/boost/shared_ptr.hpp
|
||||
%{_includedir}/boost/signal.hpp
|
||||
%{_includedir}/boost/statechart
|
||||
%{_includedir}/boost/static_assert.hpp
|
||||
%{_includedir}/boost/strong_typedef.hpp
|
||||
%{_includedir}/boost/swap.hpp
|
||||
%{_includedir}/boost/throw_exception.hpp
|
||||
%{_includedir}/boost/token_functions.hpp
|
||||
%{_includedir}/boost/token_iterator.hpp
|
||||
%{_includedir}/boost/tokenizer.hpp
|
||||
%{_includedir}/boost/type.hpp
|
||||
%{_includedir}/boost/typeof
|
||||
%{_includedir}/boost/version.hpp
|
||||
%{_includedir}/boost/visit_each.hpp
|
||||
%{_includedir}/boost/weak_ptr.hpp
|
||||
|
||||
%files -n %{libnamedevel}
|
||||
%{_libdir}/libboost_*.so
|
||||
%{_includedir}/boost
|
||||
|
||||
%files -n %{libnamedevel}-doc
|
||||
%defattr(-,root,root)
|
||||
%doc packagedoc/*
|
||||
|
||||
%files -n %{libnamestaticdevel}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libboost_*.a
|
||||
|
||||
%files -n %{name}-examples
|
||||
%defattr(-,root,root)
|
||||
%files examples
|
||||
%doc examples/*
|
||||
|
||||
|
||||
%changelog
|
||||
* The Oct 04 2012 Alexander Kazancev <kazancas@mandriva.org> 1.50.0-2
|
||||
- sync with fedora and mageia packages
|
||||
- build force with python and icu
|
||||
- build mt flavour
|
||||
|
||||
* Mon Jul 02 2012 Crispin Boylan <crisb@mandriva.org> 1.50.0-1
|
||||
+ Revision: 807763
|
||||
- New release
|
||||
|
||||
* Sat Apr 07 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1.49.0-2
|
||||
+ Revision: 789742
|
||||
- Rebuild for icu 49.x
|
||||
|
||||
* Sat Mar 31 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1.49.0-1
|
||||
+ Revision: 788431
|
||||
- Update to 1.49.0
|
||||
- Fix up rpmlint errors
|
||||
|
||||
* Tue Nov 29 2011 Andrey Bondrov <abondrov@mandriva.org> 1.48.0-2
|
||||
+ Revision: 735431
|
||||
- Add patch from upstream to fix problem with forearch in 1.48
|
||||
|
||||
* Mon Nov 28 2011 Crispin Boylan <crisb@mandriva.org> 1.48.0-1
|
||||
+ Revision: 734884
|
||||
- New release
|
||||
|
||||
* Tue Sep 06 2011 Leonardo Coelho <leonardoc@mandriva.org> 1.47.0-1
|
||||
+ Revision: 698384
|
||||
- bump new version
|
||||
- add exceptions to treat boost throw_exception
|
||||
|
||||
+ Matthew Dawkins <mattydaw@mandriva.org>
|
||||
- fix bootlibs macro on arm/mips
|
||||
|
||||
* Sun Jun 05 2011 Funda Wang <fwang@mandriva.org> 1.46.1-6
|
||||
+ Revision: 682806
|
||||
- rebuild for new icu
|
||||
|
||||
* Sun May 22 2011 Oden Eriksson <oeriksson@mandriva.com> 1.46.1-5
|
||||
+ Revision: 677149
|
||||
- rebuild
|
||||
|
||||
* Sat Apr 16 2011 Tomasz Pawel Gajc <tpg@mandriva.org> 1.46.1-4
|
||||
+ Revision: 653309
|
||||
- rebuild
|
||||
|
||||
* Tue Mar 15 2011 Funda Wang <fwang@mandriva.org> 1.46.1-3
|
||||
+ Revision: 644952
|
||||
- add patch from upstream to fix lightsprk build
|
||||
|
||||
* Mon Mar 14 2011 Funda Wang <fwang@mandriva.org> 1.46.1-2
|
||||
+ Revision: 644525
|
||||
- rebuild for new icu
|
||||
|
||||
* Sun Mar 13 2011 Funda Wang <fwang@mandriva.org> 1.46.1-1
|
||||
+ Revision: 644409
|
||||
- new version 1.46.1
|
||||
- add cmake patch from fedora, and synced cmake build conditioned
|
||||
- drop merged patch
|
||||
|
||||
* Tue Nov 02 2010 Crispin Boylan <crisb@mandriva.org> 1.44.0-4mdv2011.0
|
||||
+ Revision: 592080
|
||||
- Patch 1 to fix boost issue #4598
|
||||
|
||||
* Fri Oct 29 2010 Funda Wang <fwang@mandriva.org> 1.44.0-3mdv2011.0
|
||||
+ Revision: 590114
|
||||
- rebuild for new python
|
||||
|
||||
* Thu Sep 02 2010 Thierry Vignaud <tv@mandriva.org> 1.44.0-2mdv2011.0
|
||||
+ Revision: 575199
|
||||
- let the doc subpackage be noarch
|
||||
|
||||
* Sun Aug 22 2010 Emmanuel Andry <eandry@mandriva.org> 1.44.0-1mdv2011.0
|
||||
+ Revision: 572035
|
||||
- New version 1.44.0
|
||||
|
||||
* Wed Aug 04 2010 Funda Wang <fwang@mandriva.org> 1.43.0-2mdv2011.0
|
||||
+ Revision: 565900
|
||||
- patch1 not needed
|
||||
|
||||
+ Luis Medinas <lmedinas@mandriva.org>
|
||||
- Fix static-devel symlinks.
|
||||
|
||||
+ Matthew Dawkins <mattydaw@mandriva.org>
|
||||
- new version 1.43.0
|
||||
added random to pkgs list
|
||||
|
||||
* Sun Mar 21 2010 Funda Wang <fwang@mandriva.org> 1.42.0-3mdv2010.1
|
||||
+ Revision: 526045
|
||||
- rebuild for new icu
|
||||
|
||||
* Tue Feb 23 2010 Crispin Boylan <crisb@mandriva.org> 1.42.0-2mdv2010.1
|
||||
+ Revision: 509861
|
||||
- Add serialization patch from svn fixes crash on exit when using dlopen libs
|
||||
|
||||
+ Anssi Hannula <anssi@mandriva.org>
|
||||
- rebuild for new boost
|
||||
|
||||
* Mon Feb 08 2010 Anssi Hannula <anssi@mandriva.org> 1.42.0-1mdv2010.1
|
||||
+ Revision: 501872
|
||||
- new version
|
||||
- conditionally bring back support for building with bjam (there is no
|
||||
cmake-enabled version of 1.42.0 available)
|
||||
- drop patches applied upstream (mapnik.patch, fix-serialization.patch)
|
||||
- build only multithreaded versions of the libraries
|
||||
- split the libraries into their own subpackages to minimize installation
|
||||
footprint on user systems
|
||||
|
||||
* Thu Feb 04 2010 Jérôme Brenier <incubusss@mandriva.org> 1.41.0-3mdv2010.1
|
||||
+ Revision: 501005
|
||||
- add one patch to fix serialization to build easystroke (from upstream)
|
||||
|
||||
* Wed Feb 03 2010 Funda Wang <fwang@mandriva.org> 1.41.0-2mdv2010.1
|
||||
+ Revision: 500157
|
||||
- add fedora patch to satisfy mapnik build
|
||||
|
||||
* Wed Feb 03 2010 Funda Wang <fwang@mandriva.org> 1.41.0-1mdv2010.1
|
||||
+ Revision: 499854
|
||||
- BR xsltproc
|
||||
- New version 1.41.0 (cmake build based)
|
||||
- drop all build patches as cmake can deal with all things :D
|
||||
- revert to SONAME=VERSION, keep same with Fedora :(
|
||||
|
||||
+ Olivier Blin <blino@mandriva.org>
|
||||
- simplify long-double check
|
||||
- fix build on ARM and MIPS, they don't really have long double (from Arnaud Patard)
|
||||
|
||||
* Thu Aug 20 2009 Helio Chissini de Castro <helio@mandriva.com> 1.39.0-2mdv2010.0
|
||||
+ Revision: 418718
|
||||
- Added patch to fix pyside compilation. This is included in boost-to-be 1.4.0 official near release
|
||||
|
||||
* Sat Aug 15 2009 Emmanuel Andry <eandry@mandriva.org> 1.39.0-1mdv2010.0
|
||||
+ Revision: 416502
|
||||
- disable BR openmpi-devel, as it's not welcome in main
|
||||
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- build with graphml support
|
||||
- build with mpi support
|
||||
- fix file permissions for -devel package
|
||||
- replace patch that sets %%optflags with a new one that takes an environment
|
||||
variable in stead (P0)
|
||||
- set same ABI major as Fedora and provide compatibility symlinks for "old"
|
||||
soname fashion. This should hopefully help decrease the amount of packages
|
||||
linked against older library versions (P1)
|
||||
- sync with some fedora patches
|
||||
- new release: 1.39.1
|
||||
|
||||
* Mon Mar 02 2009 Emmanuel Andry <eandry@mandriva.org> 1.38.0-2mdv2009.1
|
||||
+ Revision: 346986
|
||||
- New version 1.38.0
|
||||
- drop P5 (merged upstream)
|
||||
|
||||
* Fri Jan 16 2009 Tomasz Pawel Gajc <tpg@mandriva.org> 1.37.0-4mdv2009.1
|
||||
+ Revision: 330353
|
||||
- Patch6: fix wrong BOOST_NO_EXCEPTIONS define placement (upstream bug #2469)
|
||||
|
||||
* Fri Dec 26 2008 Funda Wang <fwang@mandriva.org> 1.37.0-3mdv2009.1
|
||||
+ Revision: 319262
|
||||
- link with libpython
|
||||
|
||||
* Tue Dec 23 2008 Funda Wang <fwang@mandriva.org> 1.37.0-2mdv2009.1
|
||||
+ Revision: 317920
|
||||
- use correct license
|
||||
|
||||
* Sat Dec 20 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 1.37.0-1mdv2009.1
|
||||
+ Revision: 316499
|
||||
- use _disable_ld_no_undefined 1 (lof of python stuff)
|
||||
- Patch2: rediff
|
||||
- don't export optflags, better to sed them in
|
||||
- use %%ldflags
|
||||
- update to new version 1.37.0
|
||||
|
||||
* Mon Aug 18 2008 Per Øyvind Karlsen <peroyvind@mandriva.org> 1.36.0-1mdv2009.0
|
||||
+ Revision: 273337
|
||||
- new release
|
||||
- drop P6 (merged upstream)
|
||||
- compile with -O3
|
||||
|
||||
* Mon Jul 14 2008 Oden Eriksson <oeriksson@mandriva.com> 1.35.0-3mdv2009.0
|
||||
+ Revision: 234634
|
||||
- rebuild
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Thu May 29 2008 David Walluck <walluck@mandriva.org> 1.35.0-2mdv2009.0
|
||||
+ Revision: 212839
|
||||
- patch for gcc 4.3 serialization fix
|
||||
- patch for gcc 4.3 date_time fix
|
||||
|
||||
* Tue May 20 2008 Oden Eriksson <oeriksson@mandriva.com> 1.35.0-1mdv2009.0
|
||||
+ Revision: 209510
|
||||
- 1.35.0
|
||||
- rediffed the patches
|
||||
- drop upstream implemented patches (CVE-2008-0171+0172 is applied)
|
||||
- fix the find logig (thanks anssi)
|
||||
|
||||
* Tue May 20 2008 Oden Eriksson <oeriksson@mandriva.com> 1.34.1-5mdv2009.0
|
||||
+ Revision: 209434
|
||||
- added P5 from fedora (gcc43 patch)
|
||||
|
||||
* Sat Feb 09 2008 Anssi Hannula <anssi@mandriva.org> 1.34.1-4mdv2008.1
|
||||
+ Revision: 164328
|
||||
- fix CVE-2008-0171 and CVE-2008-0172 (P0, #37412)
|
||||
|
||||
+ Olivier Blin <blino@mandriva.org>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tv@mandriva.org>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Fri Nov 30 2007 Anssi Hannula <anssi@mandriva.org> 1.34.1-3mdv2008.1
|
||||
+ Revision: 114034
|
||||
- provide libboost_thread.so devel symlink for compatibility
|
||||
|
||||
+ Tomasz Pawel Gajc <tpg@mandriva.org>
|
||||
- add more explicit provides for devel pkg
|
||||
|
||||
* Thu Nov 01 2007 Anssi Hannula <anssi@mandriva.org> 1.34.1-2mdv2008.1
|
||||
+ Revision: 104690
|
||||
- use version as major as per upstream and debian
|
||||
- remove boost-configure.patch, modifies irrelevant file
|
||||
- remove boost-gcc-soname.patch, did not work as intended and is now
|
||||
unnecessary
|
||||
- use --layout=system to drop gcc version from soname and remove the
|
||||
need for manual include move hack
|
||||
- add patch from boost ml to include version in library name with
|
||||
--layout=system (boost-layout-system.patch)
|
||||
- build with libicu
|
||||
- drop obsolete hacks and comments
|
||||
- use proper bjam flags (build single- and multi-threaded versions,
|
||||
release variants only, parallel build)
|
||||
- ensure major correctness in filelist
|
||||
|
||||
* Tue Sep 04 2007 David Walluck <walluck@mandriva.org> 1.34.1-1mdv2008.1
|
||||
+ Revision: 78984
|
||||
- 1.34.1
|
||||
- new lib policy
|
||||
- rename examples subpackage
|
||||
- take patches from Fedora
|
||||
|
||||
* Fri Jul 06 2007 Adam Williamson <awilliamson@mandriva.org> 1.33.1-6mdv2008.0
|
||||
+ Revision: 49245
|
||||
- add patch6 (atomicity.h has moved in recent GCC)
|
||||
|
||||
%files build
|
||||
%doc LICENSE_1_0.txt
|
||||
%{_datadir}/boost-build/
|
||||
|
|
Loading…
Add table
Reference in a new issue