Commit 5801b222 authored by Ben Boeckel's avatar Ben Boeckel

boost: update to 1.59.0

Also patch the project to not use @rpath in its installed libraries.
parent 71d30cbc
......@@ -46,3 +46,12 @@ add_external_project_step(install_name_fixup
-Dlib_name:STRING="boost"
-P ${CMAKE_CURRENT_LIST_DIR}/fixup_library_rpath.cmake
DEPENDEES install)
add_external_project_step(boost-patch-osx-rpath
COMMENT "Fix Boost library install names"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${SuperBuild_PROJECTS_DIR}/patches/boost.tools.build.src.tools.clang-darwin.jam
<SOURCE_DIR>/tools/build/src/tools/clang-darwin.jam
DEPENDEES update
DEPENDERS patch
)
# Copyright Vladimir Prus 2004.
# Copyright Noel Belcourt 2007.
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt
# or copy at http://www.boost.org/LICENSE_1_0.txt)
import clang ;
import feature : feature ;
import os ;
import toolset ;
import toolset : flags ;
import gcc ;
import common ;
import errors ;
import generators ;
feature.extend-subfeature toolset clang : platform : darwin ;
toolset.inherit-generators clang-darwin
<toolset>clang <toolset-clang:platform>darwin
: gcc
# Don't inherit PCH generators. They were not tested, and probably
# don't work for this compiler.
: gcc.mingw.link gcc.mingw.link.dll gcc.compile.c.pch gcc.compile.c++.pch
;
generators.override clang-darwin.prebuilt : builtin.lib-generator ;
generators.override clang-darwin.prebuilt : builtin.prebuilt ;
generators.override clang-darwin.searched-lib-generator : searched-lib-generator ;
generators.register-c-compiler clang-darwin.compile.m : OBJECTIVE_C : OBJ : <toolset>clang <toolset-clang:platform>darwin ;
generators.register-c-compiler clang-darwin.compile.mm : OBJECTIVE_CPP : OBJ : <toolset>clang <toolset-clang:platform>darwin ;
toolset.inherit-rules clang-darwin : gcc ;
toolset.inherit-flags clang-darwin : gcc
: <inlining>off <inlining>on <inlining>full <optimization>space
<warnings>off <warnings>all <warnings>on
<architecture>x86/<address-model>32
<architecture>x86/<address-model>64
;
if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
{
.debug-configuration = true ;
}
# vectorization diagnostics
feature vectorize : off on full ;
# Initializes the clang-darwin toolset
# version in optional
# name (default clang++) is used to invoke the specified clang complier
# compile and link options allow you to specify addition command line options for each version
rule init ( version ? : command * : options * )
{
command = [ common.get-invocation-command clang-darwin : clang++
: $(command) ] ;
# Determine the version
local command-string = $(command:J=" ") ;
if $(command)
{
version ?= [ MATCH "^([0-9.]+)"
: [ SHELL "$(command-string) -dumpversion" ] ] ;
}
local condition = [ common.check-init-parameters clang-darwin
: version $(version) ] ;
common.handle-options clang-darwin : $(condition) : $(command) : $(options) ;
gcc.init-link-flags clang-darwin darwin $(condition) ;
}
SPACE = " " ;
toolset.flags clang-darwin.compile OPTIONS <cflags> ;
toolset.flags clang-darwin.compile.c++ OPTIONS <cxxflags> ;
toolset.flags clang-darwin.compile.m OPTIONS <mflags> ;
toolset.flags clang-darwin.compile.mm OPTIONS <mflags> ;
toolset.flags clang-darwin.compile.mm OPTIONS <mmflags> ;
# toolset.flags clang-darwin.compile INCLUDES <include> ;
# Declare flags and action for compilation.
toolset.flags clang-darwin.compile OPTIONS <optimization>off : -O0 ;
toolset.flags clang-darwin.compile OPTIONS <optimization>speed : -O3 ;
toolset.flags clang-darwin.compile OPTIONS <optimization>space : -Os ;
# For clang, 'on' and 'full' are identical
toolset.flags clang-darwin.compile OPTIONS <inlining>off : -fno-inline ;
toolset.flags clang-darwin.compile OPTIONS <inlining>on : -Wno-inline ;
toolset.flags clang-darwin.compile OPTIONS <inlining>full : -Wno-inline ;
toolset.flags clang-darwin.compile OPTIONS <warnings>off : -w ;
toolset.flags clang-darwin.compile OPTIONS <warnings>on : -Wall ;
toolset.flags clang-darwin.compile OPTIONS <warnings>all : -Wall -pedantic ;
toolset.flags clang-darwin.compile OPTIONS <warnings-as-errors>on : -Werror ;
toolset.flags clang-darwin.compile OPTIONS <debug-symbols>on : -g ;
toolset.flags clang-darwin.compile OPTIONS <profiling>on : -pg ;
toolset.flags clang-darwin.compile OPTIONS <rtti>off : -fno-rtti ;
toolset.flags clang-darwin.compile OPTIONS <flags> ;
actions compile.c
{
"$(CONFIG_COMMAND)" -x c $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}
actions compile.c++
{
"$(CONFIG_COMMAND)" -x c++ $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}
actions compile.m
{
"$(CONFIG_COMMAND)" -x objective-c $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}
actions compile.mm
{
"$(CONFIG_COMMAND)" -x objective-c++ $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}
flags clang-darwin ARFLAGS <archiveflags> ;
# Default value. Mostly for the sake of clang-linux
# that inherits from gcc, but does not has the same
# logic to set the .AR variable. We can put the same
# logic in clang-linux, but that's hardly worth the trouble
# as on Linux, 'ar' is always available.
.AR = ar ;
rule archive ( targets * : sources * : properties * )
{
# Always remove archive and start again. Here's rationale from
# Andre Hentz:
#
# I had a file, say a1.c, that was included into liba.a.
# I moved a1.c to a2.c, updated my Jamfiles and rebuilt.
# My program was crashing with absurd errors.
# After some debugging I traced it back to the fact that a1.o was *still*
# in liba.a
#
# Rene Rivera:
#
# Originally removing the archive was done by splicing an RM
# onto the archive action. That makes archives fail to build on NT
# when they have many files because it will no longer execute the
# action directly and blow the line length limit. Instead we
# remove the file in a different action, just before the building
# of the archive.
#
local clean.a = $(targets[1])(clean) ;
TEMPORARY $(clean.a) ;
NOCARE $(clean.a) ;
LOCATE on $(clean.a) = [ on $(targets[1]) return $(LOCATE) ] ;
DEPENDS $(clean.a) : $(sources) ;
DEPENDS $(targets) : $(clean.a) ;
common.RmTemps $(clean.a) : $(targets) ;
}
actions piecemeal archive
{
"$(.AR)" $(AROPTIONS) rc "$(<)" "$(>)"
"ranlib" -cs "$(<)"
}
flags clang-darwin.link USER_OPTIONS <linkflags> ;
# Declare actions for linking
rule link ( targets * : sources * : properties * )
{
SPACE on $(targets) = " " ;
# Serialize execution of the 'link' action, since
# running N links in parallel is just slower.
JAM_SEMAPHORE on $(targets) = <s>clang-darwin-link-semaphore ;
}
actions link bind LIBRARIES
{
"$(CONFIG_COMMAND)" $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" $(START-GROUP) $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS)
}
actions link.dll bind LIBRARIES
{
"$(CONFIG_COMMAND)" $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" -single_module -dynamiclib -install_name "$(<[1]:D=)" "$(>)" "$(LIBRARIES)" $(START-GROUP) $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS)
}
......@@ -55,8 +55,8 @@ add_revision(qt
URL_MD5 2edbe4d6c2eff33ef91732602f3518eb)
add_revision(boost
URL "http://www.computationalmodelbuilder.org/files/dependencies/boost_1_56_0.tar.gz"
URL_MD5 8c54705c424513fa2be0042696a3a162)
URL "http://www.computationalmodelbuilder.org/files/dependencies/boost_1_59_0.tar.bz2"
URL_MD5 6aa9a5c6a4ca1016edd0ed1178e3cb87)
add_revision(manta
URL "http://paraview.org/files/dependencies/manta-r2439.tar.gz"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment