Ticket #8638: boost_trunk_address_model.2.patch

boost/config/auto_link.hpp

@@ -15 +15 @@
 USAGE:
 ~~~~~~
 
-Before including this header you must define one or more of define the following macros:
+Before including this header you must define one or more of the following macros:
 
 BOOST_LIB_NAME:           Required: A string containing the basename of the library,
                           for example boost_regex.
@@ -41 +41 @@
 
 BOOST_LIB_PREFIX
    + BOOST_LIB_NAME
-   + "_"
+   + "-"
    + BOOST_LIB_TOOLSET
    + BOOST_LIB_THREAD_OPT
    + BOOST_LIB_RT_OPT
+   + BOOST_LIB_ADDR_OPT
    "-"
    + BOOST_LIB_VERSION
 
@@ -69 +70 @@
                       p      STLport build.
                       n      STLport build without its IOStreams.
 
+BOOST_LIB_ADDR_OPT:   The address model: "-32" or "-64".
+
 BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 
 
@@ -193 +196 @@
 #  define BOOST_LIB_THREAD_OPT
 #endif
 
+//
+// select runtime opt:
+//
 #if defined(_MSC_VER) || defined(__MWERKS__)
 
 #  ifdef _DLL
@@ -352 +358 @@
 #endif
 
 //
+// select address model opt:
+//
+#if defined(__x86_64__) || defined(__x86_64) \
+    || defined(__amd64__) || defined(__amd64) \
+    || defined(_M_X64) || defined(_M_AMD64) \
+    || defined(_M_IA64)
+#  define BOOST_LIB_ADDR_OPT "-64"
+#else
+#  define BOOST_LIB_ADDR_OPT "-32"
+#endif
+
+//
 // select linkage opt:
 //
 #if (defined(_DLL) || defined(_RTLDLL)) && defined(BOOST_DYN_LINK)
@@ -370 +388 @@
       && defined(BOOST_LIB_TOOLSET) \
       && defined(BOOST_LIB_THREAD_OPT) \
       && defined(BOOST_LIB_RT_OPT) \
+      && defined(BOOST_LIB_ADDR_OPT) \
       && defined(BOOST_LIB_VERSION)
 
 #ifdef BOOST_AUTO_LINK_TAGGED
-#  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
+#  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT BOOST_LIB_ADDR_OPT ".lib")
 #  ifdef BOOST_LIB_DIAGNOSTIC
-#     pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
+#     pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT BOOST_LIB_ADDR_OPT ".lib")
 #  endif
 #elif defined(BOOST_AUTO_LINK_NOMANGLE)
 #  pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
@@ -383 +402 @@
 #     pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
 #  endif
 #else
-#  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
+#  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT BOOST_LIB_ADDR_OPT "-" BOOST_LIB_VERSION ".lib")
 #  ifdef BOOST_LIB_DIAGNOSTIC
-#     pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
+#     pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT BOOST_LIB_ADDR_OPT "-" BOOST_LIB_VERSION ".lib")
 #  endif
 #endif
 
@@ -405 +424 @@
 #if defined(BOOST_LIB_NAME)
 #  undef BOOST_LIB_NAME
 #endif
-// Don't undef this one: it can be set by the user and should be the 
+// Don't undef this one: it can be set by the user and should be the
 // same for all libraries:
 //#if defined(BOOST_LIB_TOOLSET)
 //#  undef BOOST_LIB_TOOLSET
@@ -416 +435 @@
 #if defined(BOOST_LIB_RT_OPT)
 #  undef BOOST_LIB_RT_OPT
 #endif
+#if defined(BOOST_LIB_ADDR_OPT)
+#  undef BOOST_LIB_ADDR_OPT
+#endif
 #if defined(BOOST_LIB_LINK_OPT)
 #  undef BOOST_LIB_LINK_OPT
 #endif
@@ -426 +448 @@
 #  undef BOOST_DYN_LINK
 #endif
 
-

boostcpp.jam

@@ -122 +122 @@
         if $(layout) = versioned
         {
             result = [ common.format-name
-                <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
+                <base> <toolset> <threading> <runtime> <address-model> -$(BOOST_VERSION_TAG)
                 -$(BUILD_ID)
                 : $(name) : $(type) : $(property-set) ] ;
         }
@@ -129 +129 @@
         else if $(layout) = tagged
         {
             result = [ common.format-name
-                <base> <threading> <runtime>
+                <base> <threading> <runtime> <address-model>
                 -$(BUILD_ID)
                 : $(name) : $(type) : $(property-set) ] ;
         }