diff options
Diffstat (limited to 'zarb-ml/mageia-dev/2011-September/008366.html')
| -rw-r--r-- | zarb-ml/mageia-dev/2011-September/008366.html | 309 |
1 files changed, 309 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/2011-September/008366.html b/zarb-ml/mageia-dev/2011-September/008366.html new file mode 100644 index 000000000..ea78938d4 --- /dev/null +++ b/zarb-ml/mageia-dev/2011-September/008366.html @@ -0,0 +1,309 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-dev] [110263] (boost build change) + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5B110263%5D%20%28boost%20build%20change%29&In-Reply-To=%3C4E7E5390.1000302%40iki.fi%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="008374.html"> + <LINK REL="Next" HREF="008375.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-dev] [110263] (boost build change)</H1> + <B>Anssi Hannula</B> + <A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5B110263%5D%20%28boost%20build%20change%29&In-Reply-To=%3C4E7E5390.1000302%40iki.fi%3E" + TITLE="[Mageia-dev] [110263] (boost build change)">anssi.hannula at iki.fi + </A><BR> + <I>Sun Sep 25 00:02:56 CEST 2011</I> + <P><UL> + <LI>Previous message: <A HREF="008374.html">[Mageia-dev] removing all horde-xxxxx packages +</A></li> + <LI>Next message: <A HREF="008375.html">[Mageia-dev] [110263] (boost build change) +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#8366">[ date ]</a> + <a href="thread.html#8366">[ thread ]</a> + <a href="subject.html#8366">[ subject ]</a> + <a href="author.html#8366">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>On 20.06.2011 06:37, <A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">root at mageia.org</A> wrote: +><i> Revision +</I>><i> 110263 +</I>><i> Author +</I>><i> fwang +</I>><i> Date +</I>><i> 2011-06-20 05:37:46 +0200 (Mon, 20 Jun 2011) +</I>><i> +</I>><i> +</I>><i> Log Message +</I>><i> +</I>><i> - New version 1.46.1 +</I>><i> - synch with fedora (cmake flavour) +</I> +Is there any actual advantage big enough to justify switching the build +to use cmake instead of upstream bjam, relying on fedora-provided +non-upstream big patch that changes the entire build system? +(in the past I've run into issues when there was no cmake 'version' +available yet when packaging an update) + +In addition, the change modifies SONAMEs to a non-upstream configuration +(it adds '-mt' to them), plus changes the devel symlink names to have an +'-mt' in them (which is easily workaroundable with compatibility +symlinks which I'm adding now, though). +This makes some sense on Fedora as they package both single-threaded and +multi-threaded versions of all the libraries, while we (and e.g. Debian) +have only the multi-threaded versions (without '-mt' as per upstream). + + +(BTW, while it doesn't affect us, the Fedora convention seems quite +scary, since software could expect the non-'-mt' variant to be +multithreaded as per upstream and other distros...) + + +><i> Modified Paths +</I>><i> +</I>><i> * cauldron/boost/current/SPECS/boost.spec +</I>><i> <#cauldronboostcurrentSPECSboostspec> +</I>><i> +</I>><i> Modified: cauldron/boost/current/SPECS/boost.spec +</I>><i> =================================================================== +</I>><i> --- cauldron/boost/current/SPECS/boost.spec 2011-06-20 02:17:11 UTC (rev 110262) +</I>><i> +++ cauldron/boost/current/SPECS/boost.spec 2011-06-20 03:37:46 UTC (rev 110263) +</I>><i> @@ -1,41 +1,26 @@ +</I>><i> -%define cmake_build 0 +</I>><i> - +</I>><i> -%if %cmake_build +</I>><i> -%define cmake_pl 0 +</I>><i> -%else +</I>><i> %define packver %(echo "%{version}" | sed -e "s/\\\./_/g") +</I>><i> -%endif +</I>><i> - +</I>><i> -# From the version 13 of Fedora, the Boost libraries are delivered +</I>><i> -# with sonames equal to the Boost version (e.g., 1.41.0). +</I>><i> %define libname %mklibname boost %{version} +</I>><i> %define libnamedevel %mklibname boost -d +</I>><i> %define libnamestaticdevel %mklibname boost -d -s +</I>><i> +</I>><i> Summary: Portable C++ libraries +</I>><i> Name: boost +</I>><i> -Version: 1.44.0 +</I>><i> -Release: %mkrel 6 +</I>><i> +Version: 1.46.1 +</I>><i> +Release: %mkrel 1 +</I>><i> License: Boost +</I>><i> Group: Development/C++ +</I>><i> URL: <A HREF="http://boost.org/">http://boost.org/</A> +</I>><i> -%if %cmake_build +</I>><i> -Source0: <A HREF="http://sodium.resophonic.com/boost-cmake/%{version">http://sodium.resophonic.com/boost-cmake/%{version</A>}.cmake%{cmake_pl}/boost-%{version}.cmake%{cmake_pl}.tar.gz +</I>><i> -BuildRequires: cmake +</I>><i> -%else +</I>><i> Source0: <A HREF="http://umn.dl.sourceforge.net/sourceforge/boost/boost_%{packver">http://umn.dl.sourceforge.net/sourceforge/boost/boost_%{packver</A>}.tar.bz2 +</I>><i> -BuildRequires: boost-jam +</I>><i> -%endif +</I>><i> -# (anssi) in bjam mode, use CXXFLAGS when optimization=speed +</I>><i> -Patch0: boost-use-cxxflags.patch +</I>><i> -Patch1: boost-serialize_nvp.patch +</I>><i> +Patch0: boost-1.46.1-cmakeify-full.patch +</I>><i> +Patch3: boost-1.46.1-signals-erase.patch +</I>><i> +Patch5: boost-1.46.1-spirit.patch +</I>><i> BuildRequires: bzip2-devel +</I>><i> BuildRequires: python-devel +</I>><i> BuildRequires: zlib-devel +</I>><i> BuildRequires: icu-devel +</I>><i> -#BuildRequires: openmpi-devel +</I>><i> BuildRequires: expat-devel +</I>><i> BuildRequires: doxygen xsltproc +</I>><i> +BuildRequires: cmake +</I>><i> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +</I>><i> +</I>><i> %description +</I>><i> @@ -44,11 +29,7 @@ +</I>><i> Standard Library. This package contains only the shared libraries +</I>><i> needed for running programs using Boost. +</I>><i> +</I>><i> -%ifarch %arm %mips +</I>><i> -%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 +</I>><i> -%else +</I>><i> -%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 +</I>><i> -%endif +</I>><i> +%define boostlibs date_time filesystem graph iostreams prg_exec_monitor program_options python random regex serialization signals system thread unit_test_framework wave wserialization +</I>><i> +</I>><i> # (Anssi 01/2010) dashes are converted to underscores for macros ($lib2); +</I>><i> # The sed script adds _ when library name ends in number. +</I>><i> @@ -75,7 +56,7 @@ +</I>><i> %%files -n %%{libname$lib2} +</I>><i> %%defattr(-,root,root) +</I>><i> %%doc LICENSE_1_0.txt +</I>><i> -%{_libdir}/libboost_$lib.so.%{version} +</I>><i> +%{_libdir}/libboost_$lib-mt.so.%{version} +</I>><i> EOF +</I>><i> done)} +</I>><i> +</I>><i> @@ -132,12 +113,10 @@ +</I>><i> same place as the documentation. +</I>><i> +</I>><i> %prep +</I>><i> -%if %cmake_build +</I>><i> -%setup -q -n boost-%{version}.cmake%{cmake_pl} +</I>><i> -%else +</I>><i> %setup -q -n boost_%{packver} +</I>><i> -%endif +</I>><i> -%apply_patches +</I>><i> +%patch0 -p1 +</I>><i> +%patch3 -p1 +</I>><i> +%patch5 -p0 +</I>><i> +</I>><i> # Preparing the docs +</I>><i> mkdir packagedoc +</I>><i> @@ -150,43 +129,16 @@ +</I>><i> find libs -type f \( -name "*.?pp" ! -path "*test*" ! -path "*src*" ! -path "*tools*" -o -path "*example*" \) -exec cp --parents {} examples/ \; +</I>><i> +</I>><i> %build +</I>><i> -%if %cmake_build +</I>><i> -%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_SINGLE_THREADED=NO \ +</I>><i> +%cmake -DENABLE_SINGLE_THREADED=NO -DENABLE_DEBUG=OFF \ +</I>><i> -DINSTALL_VERSIONED=OFF -DWITH_MPI=OFF +</I>><i> %make +</I>><i> +</I>><i> -%else +</I>><i> - +</I>><i> -%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" +</I>><i> -%ifnarch %arm %mips +</I>><i> -%define boost_bjam bjam %{boost_jam_common_flags} +</I>><i> -%else +</I>><i> -%define boost_bjam bjam %{boost_jam_common_flags} --disable-long-double +</I>><i> -%endif +</I>><i> - +</I>><i> -%{boost_bjam} --prefix=%{_prefix} --libdir=%{_libdir} +</I>><i> -%endif +</I>><i> - +</I>><i> %install +</I>><i> rm -rf %{buildroot} +</I>><i> -%if %cmake_build +</I>><i> %makeinstall_std -C build +</I>><i> -%else +</I>><i> -%{boost_bjam} --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} install +</I>><i> -%endif +</I>><i> +</I>><i> -# (Anssi 01/2010) add compatibility symlinks: +</I>><i> -for file in %{buildroot}%{_libdir}/*.so; do +</I>><i> - cp -a $file ${file%.so}-mt.so +</I>><i> -done +</I>><i> -for file in %{buildroot}%{_libdir}/*.a; do +</I>><i> - ln -s $(basename $file) ${file%.a}-mt.a +</I>><i> -done +</I>><i> - +</I>><i> -# Kill any debug library versions that may show up un-invited. +</I>><i> -rm -f %{buildroot}%{_libdir}/*-d.* +</I>><i> # Remove cmake configuration files used to build the Boost libraries +</I>><i> -rm -f %{buildroot}%{_libdir}/Boost*.cmake +</I>><i> +rm -f %{buildroot}%{_libdir}/Boost*.cmake +</I>><i> +</I>><i> %clean +</I>><i> rm -rf %{buildroot} +</I>><i> @@ -195,9 +147,8 @@ +</I>><i> %defattr(644, root,root, 755) +</I>><i> %{_libdir}/libboost_*.so +</I>><i> %{_includedir}/boost +</I>><i> -%if %cmake_build +</I>><i> +%{_datadir}/cmake/boost/*.cmake +</I>><i> %{_datadir}/%{name}-%{version}/cmake/*.cmake +</I>><i> -%endif +</I>><i> +</I>><i> %files -n %{libnamedevel}-doc +</I>><i> %defattr(-,root,root) +</I>><i> @@ -210,8 +161,3 @@ +</I>><i> %files -n %{name}-examples +</I>><i> %defattr(-,root,root) +</I>><i> %doc examples/* +</I>><i> - +</I>><i> - +</I>><i> - +</I>><i> - +</I>><i> - +</I>><i> +</I>><i> +</I> + +-- +Anssi Hannula +</PRE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="008374.html">[Mageia-dev] removing all horde-xxxxx packages +</A></li> + <LI>Next message: <A HREF="008375.html">[Mageia-dev] [110263] (boost build change) +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#8366">[ date ]</a> + <a href="thread.html#8366">[ thread ]</a> + <a href="subject.html#8366">[ subject ]</a> + <a href="author.html#8366">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev +mailing list</a><br> +</body></html> |