[52605] trunk/dports/devel/boost
nox at macports.org
nox at macports.org
Fri Jun 19 11:06:00 PDT 2009
Revision: 52605
http://trac.macports.org/changeset/52605
Author: nox at macports.org
Date: 2009-06-19 11:05:59 -0700 (Fri, 19 Jun 2009)
Log Message:
-----------
boost: Use tagged layout for perfect compatibility with previous 1.38.0 portfile.
Modified Paths:
--------------
trunk/dports/devel/boost/Portfile
Added Paths:
-----------
trunk/dports/devel/boost/files/patch-layout-tagged.diff
Removed Paths:
-------------
trunk/dports/devel/boost/files/patch-Jamroot.diff
Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile 2009-06-19 16:54:35 UTC (rev 52604)
+++ trunk/dports/devel/boost/Portfile 2009-06-19 18:05:59 UTC (rev 52605)
@@ -5,7 +5,7 @@
name boost
version 1.39.0
-revision 1
+revision 2
categories devel
platforms darwin
maintainers nox openmaintainer
@@ -26,7 +26,7 @@
rmd160 4962256b48fa8563bf373b8bed97cc8655206a51
patchfiles patch-libs-random-random_device.cpp.diff \
- patch-Jamroot.diff
+ patch-layout-tagged.diff
post-extract {
file mkdir ${worksrcpath}/libs/random/build
@@ -47,6 +47,7 @@
build.cmd bjam
build.target
build.args --toolset=darwin \
+ --layout=tagged \
--debug-configuration \
--ignore-site-config \
--user-config=user-config.jam \
@@ -77,12 +78,6 @@
eval destroot.args ${build.args}
}
-post-destroot {
- foreach l [glob -type l -tails -directory ${destroot}${prefix}/lib libboost_*-mt.dylib] {
- ln -sf ${prefix}/lib/${l} ${destroot}${prefix}/lib/[lindex [split ${l} -] 0].dylib
- }
-}
-
set pythons_suffixes {24 25 26}
set pythons_ports {}
Deleted: trunk/dports/devel/boost/files/patch-Jamroot.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-Jamroot.diff 2009-06-19 16:54:35 UTC (rev 52604)
+++ trunk/dports/devel/boost/files/patch-Jamroot.diff 2009-06-19 18:05:59 UTC (rev 52605)
@@ -1,19 +0,0 @@
---- Jamroot.orig 2009-06-18 02:10:59.000000000 +0200
-+++ Jamroot 2009-06-18 02:11:55.000000000 +0200
-@@ -371,15 +371,8 @@
- # Install to system location.
-
- install-requirements = <install-source-root>$(BOOST_ROOT)/boost ;
-+install-requirements += <install-header-subdir>boost ;
-
--if $(layout-versioned)
--{
-- install-requirements += <install-header-subdir>boost-$(BOOST_VERSION_TAG)/boost ;
--}
--else
--{
-- install-requirements += <install-header-subdir>boost ;
--}
- if [ modules.peek : NT ]
- {
- install-requirements += <install-default-prefix>C:/Boost ;
Added: trunk/dports/devel/boost/files/patch-layout-tagged.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-layout-tagged.diff (rev 0)
+++ trunk/dports/devel/boost/files/patch-layout-tagged.diff 2009-06-19 18:05:59 UTC (rev 52605)
@@ -0,0 +1,146 @@
+From 5c77ecf330364ef1d85146428f769b87402cac57 Mon Sep 17 00:00:00 2001
+From: vladimir_prus <vladimir_prus at b8fc166d-592f-0410-95f2-cb63ce0dd405>
+Date: Fri, 15 May 2009 05:23:56 +0000
+Subject: [PATCH] Implement the 'tagged' layout.
+
+git-svn-id: http://svn.boost.org/svn/boost/trunk@53015 b8fc166d-592f-0410-95f2-cb63ce0dd405
+---
+ Jamroot | 104 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 53 insertions(+), 51 deletions(-)
+
+diff --git a/Jamroot b/Jamroot
+index 919ab01..ca61af1 100644
+--- Jamroot
++++ Jamroot
+@@ -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 @@ rule tag ( name : type ? : property-set )
+ {
+ 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) ;
++ }
+ }
+
+
+--
+1.6.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090619/ae4fa232/attachment-0001.html>
More information about the macports-changes
mailing list