[boost: 1/3] Yet another way to pass -DBOOST_LIB_INSTALL_DIR to cmake
Petr Machata
pmachata at fedoraproject.org
Wed Apr 6 14:51:23 UTC 2011
commit 646ad8dd4fbdf9b639557f9f4582d174e273577c
Author: Petr Machata <pmachata at redhat.com>
Date: Mon Apr 4 14:16:11 2011 +0200
Yet another way to pass -DBOOST_LIB_INSTALL_DIR to cmake
boost.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/boost.spec b/boost.spec
index db3e84d..6a6b2cc 100644
--- a/boost.spec
+++ b/boost.spec
@@ -23,7 +23,7 @@ Name: boost
Summary: The free peer-reviewed portable C++ source libraries
Version: 1.46.1
%define version_enc 1_46_1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: Boost
# The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@@ -439,10 +439,10 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH2} | %{__patch} -p0 --fuzz=0
( 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}
)
@@ -840,6 +840,12 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
%{_bindir}/bjam
%changelog
+* Mon Apr 4 2011 Petr Machata <pmachata at redhat.com> - 1.46.1-2
+- 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.
+- Related: #667294
+
* Sun Mar 13 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.46.1-1
- Merged the latest changes from the bug-fix release of Boost-1.46
More information about the scm-commits
mailing list