diff options
author | Thierry N <thierryn1 at hispeed dot ch> | 2009-08-08 15:48:23 +0200 |
---|---|---|
committer | Thierry N <thierryn1 at hispeed dot ch> | 2009-08-08 15:48:23 +0200 |
commit | 77305496a886bde3ba0dce4ba346879256bfcb46 (patch) | |
tree | c85365074ea9d19d9efec5f8cae8b753d539ece9 /base/boost/layout-tagged.patch | |
parent | 39b77c09166c2c1f0cb39f8c6eb1a159947ab783 (diff) | |
download | nutyx-extra-77305496a886bde3ba0dce4ba346879256bfcb46.tar.gz nutyx-extra-77305496a886bde3ba0dce4ba346879256bfcb46.tar.bz2 nutyx-extra-77305496a886bde3ba0dce4ba346879256bfcb46.tar.xz nutyx-extra-77305496a886bde3ba0dce4ba346879256bfcb46.zip |
Ajout de boost#1.39.0-1
Diffstat (limited to 'base/boost/layout-tagged.patch')
-rw-r--r-- | base/boost/layout-tagged.patch | 135 |
1 files changed, 135 insertions, 0 deletions
diff --git a/base/boost/layout-tagged.patch b/base/boost/layout-tagged.patch new file mode 100644 index 000000000..05e60ec91 --- /dev/null +++ b/base/boost/layout-tagged.patch @@ -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) ; ++ } + } + + |