Compare commits

...

6 Commits
master ... f14

Author SHA1 Message Date
Peter Robinson bc246e1f62 Fix compile on ARM platforms 2011-06-18 23:23:47 +01:00
Petr Machata a0f211959d Drop unused boost-random-dso.patch
- the cmakeify patch carries the rules
2011-04-01 19:24:07 +02:00
Petr Machata 8802c4407b Don't keep the cmakeify patch in lookaside cache 2011-04-01 19:18:12 +02:00
Petr Machata ec67c1492c Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/boost into f14
Conflicts:
	boost.spec
2011-04-01 19:14:41 +02:00
Petr Machata 690e758c89 Yet another way to pass -DBOOST_LIB_INSTALL_DIR to cmake 2011-04-01 18:38:28 +02:00
Denis Arnaud 5b53d565b5 - Integrated Petr's work to fix missing Boost.Filesystem V3 issue
- Resolves: #667740
2011-01-10 23:44:09 +01:00
5 changed files with 38188 additions and 32 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ clog
.build*
boost_*/
*/*.rpm
/boost_1_44_0.tar.bz2

View File

@ -1,23 +0,0 @@
diff -urpN boost_1_44_0/libs/random/CMakeLists.txt boost_1_44_0-pm/libs/random/CMakeLists.txt
--- boost_1_44_0/libs/random/CMakeLists.txt 2011-01-03 16:52:25.000000000 +0100
+++ boost_1_44_0-pm/libs/random/CMakeLists.txt 2011-01-03 16:51:17.000000000 +0100
@@ -15,7 +15,7 @@ set (lib_headers
# Add a library target to the build system
boost_library_project(
random
- # SRCDIRS
+ SRCDIRS src
TESTDIRS test
HEADERS ${lib_headers}
# DOCDIRS
diff -urpN boost_1_44_0/libs/random/src/CMakeLists.txt boost_1_44_0-pm/libs/random/src/CMakeLists.txt
--- boost_1_44_0/libs/random/src/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ boost_1_44_0-pm/libs/random/src/CMakeLists.txt 2011-01-03 16:50:40.000000000 +0100
@@ -0,0 +1,7 @@
+add_definitions(-DBOOST_RANDOM_NO_LIB=1)
+boost_add_library(
+ random
+ random_device.cpp
+ STATIC_COMPILE_FLAGS -DBOOST_RANDOM_STATIC_LINK
+ SHARED_COMPILE_FLAGS -DBOOST_ALL_DYN_LINK=1
+ )

View File

@ -11,7 +11,11 @@
%endif
# Configuration of MPI backends
%ifarch %{arm}
%bcond_with mpich2
%else
%bcond_without mpich2
%endif
%ifarch s390 s390x %{arm}
# No OpenMPI support on these arches
%bcond_with openmpi
@ -23,15 +27,18 @@ Name: boost
Summary: The free peer-reviewed portable C++ source libraries
Version: 1.44.0
%define pristine_version 1_44_0
Release: 6%{?dist}
Release: 9%{?dist}
License: Boost
# The CMake build framework (set of CMakeLists.txt and module.cmake files) is
# added on top of the official Boost release (http://www.boost.org), thanks to
# a dedicated patch. That CMake framework (and patch) is hosted and maintained
# on Gitorious, for now in the following Git repository:
# http://gitorious.org/boost/denisarnauds-zeuners-boost-cmake
# http://git.gitorious.org/~denisarnaud/boost/denisarnauds-zeuners-boost-cmake.git
# on GitHub, for now in the following Git repository:
# https://github.com/denisarnaud/boost-cmake
# A clone also exists on Gitorious, where CMake-related work was formely done:
# http://gitorious.org/~denisarnaud/boost/denisarnauds-cmake
# Upstream work is synchronised thanks to the Ryppl's hosted Git clone:
# https://github.com/ryppl/boost-svn/tree/trunk
%define full_pristine_version %{name}_%{pristine_version}
%define full_cmake_version %{name}-%{version}.cmake
URL: http://www.boost.org
@ -79,9 +86,8 @@ BuildRequires: python-devel
BuildRequires: libicu-devel
BuildRequires: chrpath
Patch0: cmakeify_boost_1440.patch
Patch0: cmakeify_boost_1440_3.patch
#Patch1: boost-cmake-soname.patch
Patch2: boost-random-dso.patch
%bcond_with tests
%bcond_with docs_generated
@ -404,7 +410,6 @@ a number of significant features and is now developed independently
# CMake framework (CMakeLists.txt, *.cmake and documentation files)
%patch0 -p1
%patch2 -p1
%build
# Support for building tests.
@ -416,10 +421,10 @@ a number of significant features and is now developed independently
( echo ============================= build serial ==================
mkdir serial
cd serial
export CXXFLAGS="-DBOOST_IOSTREAMS_USE_DEPRECATED %{optflags}"
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo %{boost_testflags} \
-DENABLE_SINGLE_THREADED=YES -DINSTALL_VERSIONED=OFF \
-DWITH_MPI=OFF \
-DCMAKE_CXX_FLAGS="%{optflags} -DBOOST_IOSTREAMS_USE_DEPRECATED" \
..
make VERBOSE=1 %{?_smp_mflags}
)
@ -817,6 +822,19 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
%{_bindir}/bjam
%changelog
* Sat Jun 18 2011 Peter Robinson <pbrobinson@gmail.com> - 1.44.0-9
- Fix compile on ARM platforms
* Fri Apr 1 2011 Petr Machata <pmachata@redhat.com> - 1.44.0-8
- Yet another way to pass -DBOOST_LIB_INSTALL_DIR to cmake. Passing
via CMAKE_CXX_FLAGS for some reason breaks when rpm re-quotes the
expression as a result of %%{optflags} expansion.
- Resolves: #667294
* Mon Jan 10 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.44.0-7
- Integrated Petr's work to fix missing Boost.Filesystem V3 issue
- Resolves: #667740
* Thu Jan 6 2011 Petr Machata <pmachata@redhat.com> - 1.44.0-6
- Don't override CXXFLAGS with -DBOOST_IOSTREAMS_USE_DEPRECATED
- Resolves: #667294

38161
cmakeify_boost_1440_3.patch Normal file

File diff suppressed because one or more lines are too long

View File

@ -1,2 +1 @@
f02578f5218f217a9f20e9c30e119c6a boost_1_44_0.tar.bz2
ecfd517994a464060f2bc015e5b4d194 cmakeify_boost_1440.patch