diff -ur boost_1_53_0/boostcpp.jam boost_1_53_0.2/boostcpp.jam --- boost_1_53_0/boostcpp.jam 2012-12-11 08:42:26.000000000 -0600 +++ boost_1_53_0.2/boostcpp.jam 2013-04-20 20:49:07.000000000 -0500 @@ -152,8 +152,7 @@ # libFoo.1.2.3.dylib format. AIX linkers do not accept version suffixes # either. Pgi compilers can not accept a library with version suffix. if $(type) = SHARED_LIB && - ! [ $(property-set).get ] in windows cygwin darwin aix && - ! [ $(property-set).get ] in pgi + ! [ $(property-set).get ] in windows cygwin darwin aix { result = $(result).$(BOOST_VERSION) ; } diff -ur boost_1_53_0/tools/build/v2/tools/pgi.jam boost_1_53_0.2/tools/build/v2/tools/pgi.jam --- boost_1_53_0/tools/build/v2/tools/pgi.jam 2011-01-25 12:06:12.000000000 -0600 +++ boost_1_53_0.2/tools/build/v2/tools/pgi.jam 2013-04-20 18:16:37.000000000 -0500 @@ -16,6 +16,7 @@ feature.extend toolset : pgi ; toolset.inherit pgi : unix ; generators.override pgi.prebuilt : builtin.lib-generator ; +generators.override pgi.prebuilt : builtin.prebuilt ; generators.override pgi.searched-lib-generator : searched-lib-generator ; # Documentation and toolchain description located @@ -117,14 +118,14 @@ SPACE on $(targets) = " " ; } -# reddish can only link statically and, somehow, the presence of -Bdynamic on the link line +# reddish can only link statically and, somehow, the presence of -Wl,-Bdynamic on the link line # marks the executable as a dynamically linked exec even though no dynamic libraries are supplied. # Yod on redstorm refuses to load an executable that is dynamically linked. # removing the dynamic link options should get us where we need to be on redstorm. -# "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME) +# "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME) actions link bind LIBRARIES { - "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bstatic -l$(FINDLIBS-ST) -Bdynamic -l$(FINDLIBS-SA) -B$(LINK-RUNTIME) + "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-B$(LINK-RUNTIME) } # Slight mods for dlls @@ -133,11 +134,11 @@ SPACE on $(targets) = " " ; } -# "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" -h$(<[1]:D=) -G "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME) +# "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" -h$(<[1]:D=) -G "$(>)" "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME) actions link.dll bind LIBRARIES { - "$(CONFIG_COMMAND)" $(OPTIONS) -shared -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" -Wl,-h -Wl,$(<[1]:D=) "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME) + "$(CONFIG_COMMAND)" $(OPTIONS) -shared -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<[-1])" "$(>)" -Wl,-h -Wl,$(<[1]:D=) "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME) } actions updated together piecemeal pgi.archive