This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via a2776645f459c0d041de17f6f38f25f73262bfd0 (commit) via 245262a6750a66d673cbd2cb81bf0193602c787a (commit) via 998f963767072176839d35bbe9b5378f718af3fa (commit) via 60b79c9941f611e92c545bf4bc6fe1f62d5bccb9 (commit) from 76d991f79dbecc7a272371072da55807987764f3 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit a2776645f459c0d041de17f6f38f25f73262bfd0 Merge: 245262a 60b79c9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 28 11:47:26 2012 +0100
Merge remote-tracking branch 'stevee/util-linux-update'
commit 245262a6750a66d673cbd2cb81bf0193602c787a Merge: 76d991f 998f963 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 28 11:47:19 2012 +0100
Merge remote-tracking branch 'stevee/boost-update'
commit 998f963767072176839d35bbe9b5378f718af3fa Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 22 21:25:19 2012 +0200
boost: Update to 1.51.0.
Major update to latest stable release.
* Switch from cmake to interal build system. * Splitt boost into a lot of subpackages. * Boost is an umbrella package which requires all subpackages. * Build boost libraries for python and python3.
commit 60b79c9941f611e92c545bf4bc6fe1f62d5bccb9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Oct 27 17:11:48 2012 +0200
util-linux: Update to 2.22.1.
This is a bugfixing release.
-----------------------------------------------------------------------
Summary of changes: boost/boost.nm | 353 ++++++++++++++++++-- boost/patches/boost-1.41.0-iostreams-zlib.patch | 21 -- boost/patches/boost-1.41.0-mapnik.patch | 21 -- .../boost-1.41.0-shared_ptr_serialization.patch | 14 - .../boost-1.51.0-context-no-exec-stack.patch | 28 ++ boost/patches/boost-graph-compile.patch | 12 - util-linux/util-linux.nm | 4 +- 7 files changed, 354 insertions(+), 99 deletions(-) delete mode 100644 boost/patches/boost-1.41.0-iostreams-zlib.patch delete mode 100644 boost/patches/boost-1.41.0-mapnik.patch delete mode 100644 boost/patches/boost-1.41.0-shared_ptr_serialization.patch create mode 100644 boost/patches/boost-1.51.0-context-no-exec-stack.patch delete mode 100644 boost/patches/boost-graph-compile.patch
Difference in files: diff --git a/boost/boost.nm b/boost/boost.nm index 5505a90..0719943 100644 --- a/boost/boost.nm +++ b/boost/boost.nm @@ -4,8 +4,11 @@ ###############################################################################
name = boost -version = 1.41.0 -release = 2 +ver_major = 1 +ver_minor = 51 +ver_plevel = 0 +version = %{ver_major}.%{ver_minor}.%{ver_plevel} +release = 1
groups = System/Libraries url = http://www.boost.org/ @@ -20,58 +23,348 @@ description libraries are suitable for eventual standardization. end
-source_dl = # Cannot find the cmake file. -sources = %{thisapp}.cmake0.tar.gz +thisapp = %{name}_%{ver_major}_%{ver_minor}_%{ver_plevel}
-CFLAGS += -fno-strict-aliasing -CXXFLAGS += -fno-strict-aliasing - -DIR_APP = %{DIR_SRC}/%{thisapp}.cmake0 +source_dl = http://sourceforge.net/projects/boost/files/%%7Bname%7D/%%7Bversion%7D/
build requires - cmake + bzip2-devel gcc-c++ + python-devel + python3-devel zlib-devel end
+ CFLAGS += -fno-strict-aliasing + CXXFLAGS += -fno-strict-aliasing + + configure_options = \ + --layout=tagged \ + --without-mpi \ + --without-graph_parallel \ + --build-dir=serial \ + \ + cflags="%{CFLAGS}" \ + cxxflags="%{CXXFLAGS}" \ + variant=release \ + threading=single,multi \ + debug-symbols=on \ + python=%{python_version} \ + pch=off + + # Get python3 abi flags. + python3_abiflags = %(%{python3}-config --abiflags) + prepare_cmds + # Create build dir. mkdir -pv %{DIR_APP}/serial + + # Bootstrap build environment. + ./bootstrap.sh --with-toolset=gcc + + # Enable boost lib for python3. + cat >> ./tools/build/v2/user-config.jam << EOF + using python : %{python3_version} : %{python3} : %{includedir}/python%{python3_version}%{python3_abiflags} : %{libdir}/python%{python3_version} ; + EOF end
build - cd %{DIR_APP}/serial && \ - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_TESTS="NONE" \ - -DENABLE_SINGLE_THREADED=YES \ - -DINSTALL_VERSIONED=OFF \ - -DWITH_MPI=OFF \ - -DENABLE_STATIC=OFF \ - -DENABLE_DEBUG=OFF \ - -DBOOST_LIB_INSTALL_DIR=%{libdir} \ - .. - - make VERBOSE=1 #%{PARALLELISMFLAGS} + # Build boost. + ./b2 -d+2 -q %{PARALLELISMFLAGS} %{configure_options} stage end
install - cd %{DIR_APP}/serial && make install DESTDIR=%{BUILDROOT} - - # Kill any debug library versions that may show up un-invited. - rm -f %{BUILDROOT}%{libdir}/*-d.* - - # Remove cmake configuration files used to build the Boost libraries - find %{BUILDROOT}%{libdir} -name '*.cmake' -exec rm -f {} ; + # Install boost. + ./b2 %{PARALLELISMFLAGS} %{configure_options} install \ + --prefix=%{BUILDROOT}%{prefix} \ + --libdir=%{BUILDROOT}%{libdir} end end
packages + # boost is just a umbrella package, that pulls all other boost + # components, except the python3 sub-package. package %{name} + requires + boost-chrono = %{thisver} + boost-context = %{thisver} + boost-date-time = %{thisver} + boost-filesystem = %{thisver} + boost-graph = %{thisver} + boost-iostreams = %{thisver} + boost-locale = %{thisver} + boost-math = %{thisver} + boost-program-options = %{thisver} + boost-python = %{thisver} + boost-random = %{thisver} + boost-regex = %{thisver} + boost-serialization = %{thisver} + boost-signals = %{thisver} + boost-system = %{thisver} + boost-test = %{thisver} + boost-thread = %{thisver} + boost-timer = %{thisver} + boost-wave = %{thisver} + end + end + + package %{name}-chrono + summary = Run-Time component of boost chrono library. + description + Run-Time support for Boost.Chrono, a set of useful time utilities. + end + + files + %{libdir}/libboost_chrono*.so.* + end + end + + package %{name}-context + summary = Run-Time component of boost context library. + description + A foundational library that provides a sort of cooperative multitasking + on asingle thread. + end + + files + %{libdir}/libboost_context*.so.* + end + end + + package %{name}-date-time + summary = Run-Time component of boost date-time library. + description + Run-Time support for Boost Date Time, set of date-time libraries based + on generic programming concepts. + end + + files + %{libdir}/libboost_date_time*.so.* + end + end + + package %{name}-filesystem + summary = Run-Time component of boost filesystem library. + description + Run-Time support for the Boost Filesystem Library, which provides + portable facilities to query and manipulate paths, files, and + directories. + end + + files + %{libdir}/libboost_filesystem*.so.* + end + end + + package %{name}-graph + summary = Run-Time component of boost graph library. + description + Run-Time support for the BGL graph library. BGL interface and graph + components are generic, in the same sense as the the Standard Template + Library (STL). + end + + files + %{libdir}/libboost_graph*.so.* + end + end + + package %{name}-iostreams + summary = Run-Time component of boost iostreams library. + description + Run-Time support for Boost.IOStreams, a framework for defining streams, + stream buffers and i/o filters. + end + + files + %{libdir}/libboost_iostreams*.so.* + end + end + + package %{name}-locale + summary = Run-Time component of boost locale library. + description + Run-Time support for Boost.Locale, a set of localization and Unicode + handling tools. + end + + files + %{libdir}/libboost_locale*.so.* + end + end + + package %{name}-math + summary = Math functions for boost TR1 library. + description + Run-Time support for C99 and C++ TR1 C-style Functions from math + portion of Boost.TR1. + end + + files + %{libdir}/libboost_math*.so.* + end + end + + package %{name}-program-options + summary = Run-Time component of boost program_options library. + description + Run-Time support of boost program options library, which allows program + developers to obtain (name, value) pairs from the user, via + conventional methods such as command line and configuration file. + end + + files + %{libdir}/libboost_program_options*.so.* + end + end + + package %{name}-python + summary = Run-Time component of boost python library. + description + The Boost Python Library is a framework for interfacing Python and + C++. It allows you to quickly and seamlessly expose C++ classes + functions and objects to Python, and vice versa, using no special + tools -- just your C++ compiler. This package contains run-time + support for Boost Python Library. + end + + files + %{libdir}/libboost_python.so.* + %{libdir}/libboost_python-mt.so.* + end + end + + package %{name}-python3 + summary = Run-Time component of boost python library for Python 3. + description + The Boost Python Library is a framework for interfacing Python and + C++. It allows you to quickly and seamlessly expose C++ classes + functions and objects to Python, and vice versa, using no special + tools -- just your C++ compiler. This package contains run-time + support for Boost Python Library compiled for Python 3. + end + + files + %{libdir}/libboost_python3*.so.* + end + end + + package %{name}-random + summary = Run-Time component of boost random library. + description + Run-Time support for boost random library. + end + + files + %{libdir}/libboost_random*.so.* + end + end + + package %{name}-regex + summary = Run-Time component of boost regular expression library. + description + Run-Time support for boost regular expression library. + end + + files + %{libdir}/libboost_regex*.so.* + end + end + + package %{name}-serialization + summary = Run-Time component of boost serialization library. + description + Run-Time support for serialization for persistence and marshaling. + end + + files + %{libdir}/libboost_serialization*.so.* + %{libdir}/libboost_wserialization*so.* + end + end + + package %{name}-signals + summary = Run-Time component of boost signals and slots library. + description + Run-Time support for managed signals & slots callback implementation. + end + + files + %{libdir}/libboost_signals*.so.* + end + end + + package %{name}-system + summary = Run-Time component of boost system support library. + description + Run-Time component of Boost operating system support library, including + the diagnostics support that will be part of the C++0x standard + library. + end + + files + %{libdir}/libboost_system*.so.* + end + end + + package %{name}-test + summary = Run-Time component of boost test library. + description + Run-Time support for simple program testing, full unit testing, and for + program execution monitoring. + end + + files + %{libdir}/libboost_prg_exec_monitor*.so.* + %{libdir}/libboost_unit_test_framework*.so.* + end + end + + package %{name}-thread + summary = Run-Time component of boost thread library. + description + Run-Time component Boost.Thread library, which provides classes and + functions for managing multiple threads of execution, and for + synchronizing data between the threads or providing separate copies of + data specific to individual threads. + end + + files + %{libdir}/libboost_thread*.so.* + end + end + + package %{name}-timer + summary = Run-Time component of boost timer library. + description + "How long does my C++ code take to run?" + The Boost Timer library answers that question and does so portably, + with as little as one #include and one additional line of code. + end + + files + %{libdir}/libboost_timer*.so.* + end + end + + package %{name}-wave + summary = Run-Time component of boost C99/C++ pre-processing library. + description + Run-Time support for the Boost.Wave library, a Standards conforming, + and highly configurable implementation of the mandated C99/C++ + pre-processor functionality. + end + + files + %{libdir}/libboost_wave*.so.* + end + end
package %{name}-devel template DEVEL + + requires = %{name} = %{thisver} end
package %{name}-debuginfo diff --git a/boost/patches/boost-1.41.0-iostreams-zlib.patch b/boost/patches/boost-1.41.0-iostreams-zlib.patch deleted file mode 100644 index 09b900c..0000000 --- a/boost/patches/boost-1.41.0-iostreams-zlib.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: /trunk/boost/iostreams/filter/zlib.hpp -=================================================================== ---- a/boost/iostreams/filter/zlib.hpp (revision 45783) -+++ b/boost/iostreams/filter/zlib.hpp (revision 57610) -@@ -21,4 +21,5 @@ - #include <new> - #include <boost/config.hpp> // MSVC, STATIC_CONSTANT, DEDUCED_TYPENAME, DINKUM. -+#include <boost/cstdint.hpp> // uint*_t - #include <boost/detail/workaround.hpp> - #include <boost/iostreams/constants.hpp> // buffer size. -@@ -44,7 +45,7 @@ - // Typedefs - --typedef unsigned int uint; --typedef unsigned char byte; --typedef unsigned long ulong; -+typedef uint32_t uint; -+typedef uint8_t byte; -+typedef uint32_t ulong; - - // Prefix 'x' prevents symbols from being redefined when Z_PREFIX is defined diff --git a/boost/patches/boost-1.41.0-mapnik.patch b/boost/patches/boost-1.41.0-mapnik.patch deleted file mode 100644 index c7a0a18..0000000 --- a/boost/patches/boost-1.41.0-mapnik.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp~ /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp ---- a/boost/iostreams/device/mapped_file.hpp~ 2009-12-17 20:51:56.000000000 +0100 -+++ b/boost/iostreams/device/mapped_file.hpp 2010-01-25 10:33:43.000000000 +0100 -@@ -4,6 +4,9 @@ - // Distributed under the Boost Software License, Version 1.0. (See accompanying - // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.) - -+#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED -+#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED -+ - #if defined(_MSC_VER) && (_MSC_VER >= 1020) - # pragma once - #endif -@@ -591,3 +594,5 @@ operator^=(mapped_file::mapmode& a, mapp - } } // End namespaces iostreams, boost. - - #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas -+ -+#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED - -Diff finished. Mon Jan 25 10:33:55 2010 diff --git a/boost/patches/boost-1.41.0-shared_ptr_serialization.patch b/boost/patches/boost-1.41.0-shared_ptr_serialization.patch deleted file mode 100644 index f1312b6..0000000 --- a/boost/patches/boost-1.41.0-shared_ptr_serialization.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp~ /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp ---- boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp~ 2009-12-17 20:51:55.000000000 +0100 -+++ boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp 2010-02-22 14:13:18.000000000 +0100 -@@ -108,7 +108,7 @@ public: - struct non_polymorphic { - static const boost::serialization::extended_type_info * - get_object_identifier(T & t){ -- return boost::serialization::singleton< -+ return &boost::serialization::singleton< - BOOST_DEDUCED_TYPENAME - boost::serialization::type_info_implementation<T>::type - >::get_const_instance(); - -Diff finished. Mon Feb 22 14:13:38 2010 diff --git a/boost/patches/boost-1.51.0-context-no-exec-stack.patch b/boost/patches/boost-1.51.0-context-no-exec-stack.patch new file mode 100644 index 0000000..dee44ad --- /dev/null +++ b/boost/patches/boost-1.51.0-context-no-exec-stack.patch @@ -0,0 +1,28 @@ +diff -Nur a/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S b/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S +--- a/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S 2012-07-03 21:12:31.000000000 +0200 ++++ b/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S 2012-10-27 19:25:08.016850683 +0200 +@@ -45,6 +45,10 @@ + * * + * *****************************************************************/ + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif ++ + .text + .globl jump_fcontext + .align 2 +diff -Nur a/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S b/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S +--- a/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S 2012-07-03 21:12:31.000000000 +0200 ++++ b/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S 2012-10-27 19:24:34.166680913 +0200 +@@ -31,6 +31,10 @@ + * * + * *****************************************************************/ + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif ++ + .text + .globl jump_fcontext + .align 2 diff --git a/boost/patches/boost-graph-compile.patch b/boost/patches/boost-graph-compile.patch deleted file mode 100644 index fe8384b..0000000 --- a/boost/patches/boost-graph-compile.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** a/boost/graph/distributed/detail/mpi_process_group.ipp.orig 2009-12-16 15:46:32.410223363 -0800 ---- b/boost/graph/distributed/detail/mpi_process_group.ipp 2009-12-16 15:47:28.700348300 -0800 -*************** -*** 19,24 **** ---- 19,25 ---- - #endif - - #include <cassert> -+ #include <cstdio> - #include <algorithm> - #include <boost/graph/parallel/detail/untracked_pair.hpp> - #include <numeric> diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 676683d..60a54fc 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -5,9 +5,11 @@
name = util-linux major_ver = 2.22 -version = %{major_ver} +minor_ver = 1 +version = %{major_ver}.%{minor_ver} release = 1
+maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base url = http://kernel.org/~kzak/util-linux/ license = GPLv2 and GPLv2+ and BSD with advertising and Public Domain
hooks/post-receive -- IPFire 3.x development tree