diff -ruN boost_1_55_0-orig/boost/archive/iterators/transform_width.hpp boost_1_55_0/boost/archive/iterators/transform_width.hpp --- boost_1_55_0-orig/boost/archive/iterators/transform_width.hpp 2013-04-28 11:07:27.000000000 -0500 +++ boost_1_55_0/boost/archive/iterators/transform_width.hpp 2014-12-21 07:48:05.000000000 -0600 @@ -30,6 +30,8 @@ #include #include +#include // std::min + namespace boost { namespace archive { namespace iterators { diff -ruN boost_1_55_0-orig/tools/build/v2/tools/darwin.jam boost_1_55_0/tools/build/v2/tools/darwin.jam --- boost_1_55_0-orig/tools/build/v2/tools/darwin.jam 2013-05-20 23:14:18.000000000 -0500 +++ boost_1_55_0/tools/build/v2/tools/darwin.jam 2014-12-21 07:48:21.000000000 -0600 @@ -20,6 +20,8 @@ import property-set ; import regex ; import errors ; +import os ; +import option ; ## Use a framework. feature framework : : free ; @@ -573,11 +575,16 @@ { setup-address-model $(targets) : $(sources) : $(properties) ; prepare-framework-path $(<) ; + local prefix = [ option.get prefix ] ; + LIB_INSTALL_DIR = [ option.get libdir : $(prefix)/lib ] ; + VERSIONINFO_COMP = [ option.get compatibility_version ] ; + VERSIONINFO_CUR = [ option.get current_version ] ; + UNDEFINED = [ option.get undefined ] ; } actions link.dll bind LIBRARIES { - "$(CONFIG_COMMAND)" -dynamiclib -Wl,-single_module -install_name "$(<:B)$(<:S)" -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS) + "$(CONFIG_COMMAND)" -dynamiclib $(UNDEFINED) -Wl,-single_module -install_name "$(LIB_INSTALL_DIR)/$(<:B)-1_@BOOST_MINOR@$(<:S)" -compatibility_version $(VERSIONINFO_COMP) -current_version $(VERSIONINFO_CUR) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS) } # We use libtool instead of ar to support universal binary linking