| 1 |
hasufell 14/07/29 13:32:18 |
| 2 |
|
| 3 |
Added: boost-1.52.0-threads.patch |
| 4 |
Log: |
| 5 |
fix build with USE=-threads wrt #458404 |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/boost/files/boost-1.52.0-threads.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/files/boost-1.52.0-threads.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/files/boost-1.52.0-threads.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: boost-1.52.0-threads.patch |
| 16 |
=================================================================== |
| 17 |
Index: /trunk/boostcpp.jam |
| 18 |
=================================================================== |
| 19 |
--- /trunk/boostcpp.jam (revision 79301) |
| 20 |
+++ /trunk/boostcpp.jam (revision 81000) |
| 21 |
@@ -210,6 +210,44 @@ |
| 22 |
} |
| 23 |
|
| 24 |
+rule filtered-target ( name : message + : sources + : requirements * ) |
| 25 |
+{ |
| 26 |
+ message $(name)-message : warning: $(message) ; |
| 27 |
+ alias $(name) : $(sources) : $(requirements) ; |
| 28 |
+ alias $(name) : $(name)-message ; |
| 29 |
+ |
| 30 |
+ local p = [ project.current ] ; |
| 31 |
+ $(p).mark-target-as-explicit $(name) ; |
| 32 |
+ $(p).mark-target-as-explicit $(name)-message ; |
| 33 |
+} |
| 34 |
+ |
| 35 |
rule declare_install_and_stage_proper_targets ( libraries * : headers * ) |
| 36 |
{ |
| 37 |
+ for local l in $(libraries) |
| 38 |
+ { |
| 39 |
+ if $(l) = locale |
| 40 |
+ { |
| 41 |
+ filtered-target $(l)-for-install : |
| 42 |
+ Skipping Boost.Locale library with threading=single. : |
| 43 |
+ libs/$(l)/build : <threading>multi ; |
| 44 |
+ } |
| 45 |
+ else if $(l) = wave |
| 46 |
+ { |
| 47 |
+ filtered-target $(l)-for-install : |
| 48 |
+ Skipping Boost.Wave library with threading=single. : |
| 49 |
+ libs/$(l)/build : <threading>multi ; |
| 50 |
+ } |
| 51 |
+ else if $(l) = thread |
| 52 |
+ { |
| 53 |
+ filtered-target $(l)-for-install : |
| 54 |
+ Skipping Boost.Thread library with threading=single. : |
| 55 |
+ libs/$(l)/build : <threading>multi ; |
| 56 |
+ } |
| 57 |
+ else |
| 58 |
+ { |
| 59 |
+ alias $(l)-for-install : libs/$(l)/build ; |
| 60 |
+ } |
| 61 |
+ } |
| 62 |
+ local library-targets = $(libraries)-for-install ; |
| 63 |
+ |
| 64 |
install-requirements = <install-source-root>$(BOOST_ROOT)/boost ; |
| 65 |
|
| 66 |
@@ -239,5 +277,5 @@ |
| 67 |
: $(install-requirements) <install-no-version-symlinks>on |
| 68 |
: |
| 69 |
- : libs/$(libraries)/build |
| 70 |
+ : $(libraries)-for-install |
| 71 |
: $(headers) |
| 72 |
; |
| 73 |
@@ -246,5 +284,5 @@ |
| 74 |
# Install just library. |
| 75 |
install stage-proper |
| 76 |
- : libs/$(libraries)/build |
| 77 |
+ : $(libraries)-for-install |
| 78 |
: <location>$(stage-locate)/lib |
| 79 |
<install-dependencies>on <install-type>LIB |
Archives