[arch-commits] Commit in boost/trunk (4 files)
Ionut Biru
ibiru at archlinux.org
Sat Sep 11 23:46:02 UTC 2010
Date: Saturday, September 11, 2010 @ 19:46:01
Author: ibiru
Revision: 90486
cleanup
Deleted:
boost/trunk/fix-gzip-crc.patch
boost/trunk/layout-tagged.patch
boost/trunk/serialization_fix.patch
boost/trunk/translate_exception.patch
---------------------------+
fix-gzip-crc.patch | 24 -------
layout-tagged.patch | 135 --------------------------------------------
serialization_fix.patch | 12 ---
translate_exception.patch | 10 ---
4 files changed, 181 deletions(-)
Deleted: fix-gzip-crc.patch
===================================================================
--- fix-gzip-crc.patch 2010-09-11 23:45:55 UTC (rev 90485)
+++ fix-gzip-crc.patch 2010-09-11 23:46:01 UTC (rev 90486)
@@ -1,24 +0,0 @@
-diff -Nur boost_1_41_0.orig/boost/iostreams/filter/zlib.hpp boost_1_41_0/boost/iostreams/filter/zlib.hpp
---- boost_1_41_0.orig/boost/iostreams/filter/zlib.hpp 2009-10-14 18:20:36.000000000 +0300
-+++ boost_1_41_0/boost/iostreams/filter/zlib.hpp 2009-12-13 16:47:53.078056507 +0200
-@@ -20,6 +20,7 @@
- #include <memory> // allocator, bad_alloc.
- #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.
- #include <boost/iostreams/detail/config/auto_link.hpp>
-@@ -43,9 +44,9 @@
- namespace zlib {
- // 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
- typedef void* (*xalloc_func)(void*, zlib::uint, zlib::uint);
Deleted: layout-tagged.patch
===================================================================
--- layout-tagged.patch 2010-09-11 23:45:55 UTC (rev 90485)
+++ layout-tagged.patch 2010-09-11 23:46:01 UTC (rev 90486)
@@ -1,135 +0,0 @@
-Patch to add --layout=tagged option which has the same behaviour as the
-previous --layout=system. This comes from boost svn changeset r53015
-https://svn.boost.org/trac/boost/changeset/53015/trunk
-
---- Jamroot.orig 2009-06-15 23:01:28.000000000 -0400
-+++ Jamroot 2009-06-15 23:08:08.000000000 -0400
-@@ -64,21 +64,26 @@
- # versions of Boost or multiple compilers can
- # be used on the same system.
- #
--# versioned (default) - Names of boost
--# binaries include the Boost version
--# number and the name and version of the
--# compiler. Boost headers are installed
--# in a subdirectory of <HDRDIR> whose
--# name contains the Boost version
--# number.
--#
--# system - Binaries names do not include
--# the Boost version number or the name
--# and version number of the compiler.
--# Boost headers are installed directly
--# into <HDRDIR>. This option is
--# intended for system integrators who
--# are building distribution packages.
-+# versioned (default) - Names of boost binaries
-+# include the Boost version number, name and
-+# version of the compiler and encoded build
-+# properties. Boost headers are installed in a
-+# subdirectory of <HDRDIR> whose name contains
-+# the Boost version number.
-+#
-+# tagged -- Names of boost binaries include the
-+# encoded build properties such as variant and
-+# threading, but do not including compiler name
-+# and version, or Boost version. This option is
-+# useful if you build several variants of Boost,
-+# using the same compiler.
-+#
-+# system - Binaries names do not include the
-+# Boost version number or the name and version
-+# number of the compiler. Boost headers are
-+# installed directly into <HDRDIR>. This option
-+# is intended for system integrators who are
-+# building distribution packages.
- #
- # --buildid=ID Adds the specified ID to the name of built
- # libraries. The default is to not add anything.
-@@ -318,53 +323,50 @@
- {
- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
- {
-+ local result ;
- if $(layout) = versioned
- {
-- local result = [ common.format-name
-+ result = [ common.format-name
- <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
- -$(BUILD_ID)
- : $(name) : $(type) : $(property-set) ] ;
--
-- # Optionally add version suffix. On NT, library with version suffix
-- # will not be recognized by linkers. On CYGWIN, we get strage
-- # duplicate symbol errors when library is generated with version
-- # suffix. On OSX, version suffix is not needed -- the linker expects
-- # the libFoo.1.2.3.dylib format. AIX linkers do not accept version
-- # suffixes either. Pgi compilers can not accept library with version
-- # suffix.
-- if $(type) = SHARED_LIB &&
-- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
-- ! ( [ $(property-set).get <toolset> ] in pgi ) )
-- {
-- result = $(result).$(BOOST_VERSION) ;
-- }
--
-- return $(result) ;
-+ }
-+ else if $(layout) = tagged
-+ {
-+ result = [ common.format-name
-+ <base> <threading> <runtime>
-+ -$(BUILD_ID)
-+ : $(name) : $(type) : $(property-set) ] ;
- }
-- else
-+ else if $(layout) = system
- {
-- local result = [ common.format-name
-+ result = [ common.format-name
- <base>
- -$(BUILD_ID)
- : $(name) : $(type) : $(property-set) ] ;
--
-- # Optionally add version suffix. On NT, library with version suffix
-- # will not be recognized by linkers. On CYGWIN, we get strage
-- # duplicate symbol errors when library is generated with version
-- # suffix. On OSX, version suffix is not needed -- the linker expects
-- # the libFoo.1.2.3.dylib format. AIX linkers do not accept version
-- # suffixes either. Pgi compilers can not accept library with version
-- # suffix.
-- if $(type) = SHARED_LIB &&
-- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
-- ! ( [ $(property-set).get <toolset> ] in pgi ) )
-- {
-- result = $(result).$(BOOST_VERSION) ;
-- }
--
-- return $(result) ;
- }
-- }
-+ else
-+ {
-+ ECHO "error: invalid layout '$(layout)'" ;
-+ EXIT ;
-+ }
-+
-+ # Optionally add version suffix. On NT, library with version suffix
-+ # will not be recognized by linkers. On CYGWIN, we get strage
-+ # duplicate symbol errors when library is generated with version
-+ # suffix. On OSX, version suffix is not needed -- the linker expects
-+ # the libFoo.1.2.3.dylib format. AIX linkers do not accept version
-+ # suffixes either. Pgi compilers can not accept library with version
-+ # suffix.
-+ if $(type) = SHARED_LIB &&
-+ ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
-+ ! ( [ $(property-set).get <toolset> ] in pgi ) )
-+ {
-+ result = $(result).$(BOOST_VERSION) ;
-+ }
-+
-+ return $(result) ;
-+ }
- }
-
-
Deleted: serialization_fix.patch
===================================================================
--- serialization_fix.patch 2010-09-11 23:45:55 UTC (rev 90485)
+++ serialization_fix.patch 2010-09-11 23:46:01 UTC (rev 90486)
@@ -1,12 +0,0 @@
-diff -Nur boost_1_41_0.old/boost/archive/shared_ptr_helper.hpp boost_1_41_0/boost/archive/shared_ptr_helper.hpp
---- boost_1_41_0.old/boost/archive/shared_ptr_helper.hpp 2009-09-20 05:18:42.000000000 +0300
-+++ boost_1_41_0/boost/archive/shared_ptr_helper.hpp 2009-12-17 22:20:48.666281335 +0200
-@@ -108,7 +108,7 @@
- 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();
Deleted: translate_exception.patch
===================================================================
--- translate_exception.patch 2010-09-11 23:45:55 UTC (rev 90485)
+++ translate_exception.patch 2010-09-11 23:46:01 UTC (rev 90486)
@@ -1,10 +0,0 @@
---- a/boost/python/detail/translate_exception.hpp 2009-07-25 15:04:50.000000000 -0700
-+++ b/boost/python/detail/translate_exception.hpp 2009-07-25 15:04:50.000000000 -0700
-@@ -9,6 +9,7 @@
-
- # include <boost/call_traits.hpp>
- # include <boost/type_traits/add_const.hpp>
-+# include <boost/type_traits/add_reference.hpp>
-
- # include <boost/function/function0.hpp>
-
More information about the arch-commits
mailing list