- Split the CMake-buildable tar-ball into pristine upstream tar-ball
and CMake framework patch
This commit is contained in:
Denis Arnaud
parent
a4e10f90e4
commit
99812266c6
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,7 +1,6 @@
|
|||||||
boost-*.tar.*
|
boost*.tar.*
|
||||||
boost-*.src.rpm
|
boost-*.src.rpm
|
||||||
boost-cmake-soname.patch
|
cmakeify_boost_1440.patch
|
||||||
clog
|
clog
|
||||||
.build*
|
.build*
|
||||||
|
|
||||||
boost-1.44.0.cmake.tar.bz2
|
|
||||||
|
|||||||
@ -1,19 +0,0 @@
|
|||||||
*** tools/build/CMake/BoostCore.cmake.orig 2010-01-12 20:01:46.006547352 -0800
|
|
||||||
--- tools/build/CMake/BoostCore.cmake 2010-01-12 20:02:54.222546929 -0800
|
|
||||||
*************** macro(boost_library_variant LIBNAME)
|
|
||||||
*** 755,761 ****
|
|
||||||
if (BUILD_SOVERSIONED)
|
|
||||||
set_target_properties(${VARIANT_LIBNAME}
|
|
||||||
PROPERTIES
|
|
||||||
! SOVERSION "${BOOST_VERSION}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif ()
|
|
||||||
--- 755,761 ----
|
|
||||||
if (BUILD_SOVERSIONED)
|
|
||||||
set_target_properties(${VARIANT_LIBNAME}
|
|
||||||
PROPERTIES
|
|
||||||
! SOVERSION "_FEDORA_SONAME"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif ()
|
|
||||||
38
boost.spec
38
boost.spec
@ -22,20 +22,20 @@
|
|||||||
Name: boost
|
Name: boost
|
||||||
Summary: The free peer-reviewed portable C++ source libraries
|
Summary: The free peer-reviewed portable C++ source libraries
|
||||||
Version: 1.44.0
|
Version: 1.44.0
|
||||||
Release: 0.6%{?dist}
|
%define pristine_version 1_44_0
|
||||||
|
Release: 1%{?dist}
|
||||||
License: Boost
|
License: Boost
|
||||||
|
|
||||||
# The CMake build framework is added on top of the official Boost release
|
# The CMake build framework (set of CMakeLists.txt and module.cmake files) is
|
||||||
# (http://www.boost.org), and hosted on Gitorious, for now in the following
|
# added on top of the official Boost release (http://www.boost.org), thanks to
|
||||||
# Git repository: http://gitorious.org/boost/denisarnauds-zeuners-boost-cmake
|
# a dedicated patch. That CMake framework (and patch) is hosted and maintained
|
||||||
# Optionally, the CMake framework (set of CMakeLists.txt and module.cmake files)
|
# on Gitorious, for now in the following Git repository:
|
||||||
# could be added thanks to a patch.
|
# http://gitorious.org/boost/denisarnauds-zeuners-boost-cmake
|
||||||
#URL: http://gitorious.org/boost/zeuners-boost-cmake/archive-tarball/%{version}
|
%define full_pristine_version %{name}_%{pristine_version}
|
||||||
#URL: http://gitorious.org/boost/denisarnauds-zeuners-boost-cmake/archive-tarball/%{version}
|
%define full_cmake_version %{name}-%{version}.cmake
|
||||||
URL: http://www.boost.org
|
URL: http://www.boost.org
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
%define full_version %{name}-%{version}.cmake
|
Source: http://downloads.sourceforge.net/%{name}/%{full_pristine_version}.tar.bz2
|
||||||
Source: %{url}/%{full_version}.tar.bz2
|
|
||||||
|
|
||||||
# From the version 13 of Fedora, the Boost libraries are delivered
|
# From the version 13 of Fedora, the Boost libraries are delivered
|
||||||
# with sonames equal to the Boost version (e.g., 1.41.0). On older
|
# with sonames equal to the Boost version (e.g., 1.41.0). On older
|
||||||
@ -77,7 +77,8 @@ BuildRequires: python-devel
|
|||||||
BuildRequires: libicu-devel
|
BuildRequires: libicu-devel
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
|
|
||||||
Patch0: boost-cmake-soname.patch
|
Patch0: cmakeify_boost_1440.patch
|
||||||
|
#Patch1: boost-cmake-soname.patch
|
||||||
|
|
||||||
%bcond_with tests
|
%bcond_with tests
|
||||||
%bcond_with docs_generated
|
%bcond_with docs_generated
|
||||||
@ -365,9 +366,10 @@ backend to do the parallel work.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{full_version}
|
%setup -q -n %{full_pristine_version}
|
||||||
|
|
||||||
sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH0} | %{__patch} -p0 --fuzz=0
|
# CMake framework (CMakeLists.txt, *.cmake and documentation files)
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Support for building tests.
|
# Support for building tests.
|
||||||
@ -443,14 +445,14 @@ if [ -f testing.log ]; then
|
|||||||
else
|
else
|
||||||
echo "error with results"
|
echo "error with results"
|
||||||
fi
|
fi
|
||||||
cd %{_builddir}/%{full_version}
|
cd %{_builddir}/%{full_pristine_version}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT
|
%{__rm} -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
cd %{_builddir}/%{full_version}/
|
cd %{_builddir}/%{full_pristine_version}/
|
||||||
|
|
||||||
%if %{with openmpi}
|
%if %{with openmpi}
|
||||||
%{_openmpi_load}
|
%{_openmpi_load}
|
||||||
@ -504,7 +506,7 @@ find $RPM_BUILD_ROOT/%{_libdir} -name '*.cmake' -exec %{__rm} -f {} \;
|
|||||||
%{__rm} -rf %{boost_docdir} && %{__mkdir_p} %{boost_docdir}/html
|
%{__rm} -rf %{boost_docdir} && %{__mkdir_p} %{boost_docdir}/html
|
||||||
|
|
||||||
# Install documentation files (HTML pages) within the temporary place
|
# Install documentation files (HTML pages) within the temporary place
|
||||||
cd %{_builddir}/%{full_version}
|
cd %{_builddir}/%{full_pristine_version}
|
||||||
DOCPATH=%{boost_docdir}
|
DOCPATH=%{boost_docdir}
|
||||||
find libs doc more -type f \( -name \*.htm -o -name \*.html \) \
|
find libs doc more -type f \( -name \*.htm -o -name \*.html \) \
|
||||||
| sed -n '/\//{s,/[^/]*$,,;p}' \
|
| sed -n '/\//{s,/[^/]*$,,;p}' \
|
||||||
@ -740,6 +742,10 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Aug 21 2010 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.44.0-1
|
||||||
|
- Split the CMake-buildable tar-ball into pristine upstream tar-ball
|
||||||
|
and CMake framework patch
|
||||||
|
|
||||||
* Fri Aug 16 2010 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.44.0-0.6
|
* Fri Aug 16 2010 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.44.0-0.6
|
||||||
- Merged the latest changes from the now final release of Boost-1.44
|
- Merged the latest changes from the now final release of Boost-1.44
|
||||||
|
|
||||||
|
|||||||
16229
cmakeify_boost_1440.patch
Normal file
16229
cmakeify_boost_1440.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user