[arch-commits] Commit in boost/repos (4 files)

Kevin Piché kevin at archlinux.org
Sat Jun 20 21:36:43 EDT 2009


    Date: Saturday, June 20, 2009 @ 21:36:43
  Author: kevin
Revision: 43261

I hate svn, part 2

Added:
  boost/repos/testing-i686/layout-tagged.patch
    (from rev 43257, boost/trunk/layout-tagged.patch)
Modified:
  boost/repos/testing-i686/	(properties)
Deleted:
  boost/repos/testing-i686/0001-date_time-gcc-4.3-fix.patch
  boost/repos/testing-i686/serialization_gcc43.patch

----------------------------------+
 0001-date_time-gcc-4.3-fix.patch |   25 ------
 layout-tagged.patch              |  135 +++++++++++++++++++++++++++++++++++++
 serialization_gcc43.patch        |   44 ------------
 3 files changed, 135 insertions(+), 69 deletions(-)


Property changes on: boost/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /boost/trunk:1-42930
   + /boost/trunk:1-42930,43257

Deleted: testing-i686/0001-date_time-gcc-4.3-fix.patch
===================================================================
--- testing-i686/0001-date_time-gcc-4.3-fix.patch	2009-06-21 01:00:06 UTC (rev 43260)
+++ testing-i686/0001-date_time-gcc-4.3-fix.patch	2009-06-21 01:36:43 UTC (rev 43261)
@@ -1,25 +0,0 @@
-From 88f7023cc36d82133cfa0e705531a9d73feb4686 Mon Sep 17 00:00:00 2001
-From: Tim Blechmann <tim at klingt.org>
-Date: Sat, 2 Feb 2008 17:22:58 +0100
-Subject: [PATCH] date_time: gcc-4.3 fix
-
----
- boost/date_time/tz_db_base.hpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/boost/date_time/tz_db_base.hpp b/boost/date_time/tz_db_base.hpp
-index b9c0a8a..03f748e 100644
---- a/boost/date_time/tz_db_base.hpp
-+++ b/boost/date_time/tz_db_base.hpp
-@@ -158,7 +158,7 @@ namespace boost {
-       typedef typename time_zone_type::base_type time_zone_base_type;
-       typedef typename time_zone_type::time_duration_type time_duration_type;
-       typedef time_zone_names_base<char_type> time_zone_names;
--      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
-+      typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
-       typedef std::basic_string<char_type> string_type;
- 
-       //! Constructs an empty database
--- 
-1.5.3.8
-

Copied: boost/repos/testing-i686/layout-tagged.patch (from rev 43257, boost/trunk/layout-tagged.patch)
===================================================================
--- testing-i686/layout-tagged.patch	                        (rev 0)
+++ testing-i686/layout-tagged.patch	2009-06-21 01:36:43 UTC (rev 43261)
@@ -0,0 +1,135 @@
+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: testing-i686/serialization_gcc43.patch
===================================================================
--- testing-i686/serialization_gcc43.patch	2009-06-21 01:00:06 UTC (rev 43260)
+++ testing-i686/serialization_gcc43.patch	2009-06-21 01:36:43 UTC (rev 43261)
@@ -1,44 +0,0 @@
-Index: /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp
-===================================================================
---- /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp	(Revision 43953)
-+++ /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp	(Arbeitskopie)
-@@ -17,6 +17,7 @@
- //  See http://www.boost.org for updates, documentation, and revision history.
- 
- #include <cstddef> // std::size_t
-+#include <climits> // ULONG_MAX
- #include <boost/config.hpp>
- 
- #if defined(BOOST_NO_STDC_NAMESPACE)
-@@ -38,6 +39,9 @@
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
- // we shouldn't define separate functions for int64 data types.
-+#ifndef ULONG_MAX
-+# error "ULONG_MAX is not defined"
-+#endif
- #if defined(BOOST_NO_INT64_T) \
-     || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
- #   define BOOST_NO_INTRINSIC_INT64_T
-Index: /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp
-===================================================================
---- /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp	(Revision 43953)
-+++ /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp	(Arbeitskopie)
-@@ -18,6 +18,7 @@
- 
- #include <cstddef> // size_t
- #include <string>
-+#include <climits> // ULONG_MAX
- 
- #include <boost/config.hpp>
- #if defined(BOOST_NO_STDC_NAMESPACE)
-@@ -37,6 +38,9 @@
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
- // we shouldn't define separate functions for int64 data types.
-+#ifndef ULONG_MAX
-+# error "ULONG_MAX is not defined"
-+#endif
- #if defined(BOOST_NO_INT64_T) \
-     || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
- #   define BOOST_NO_INTRINSIC_INT64_T



More information about the arch-commits mailing list