1 |
commit: 107a37c0be213fac13b09b575f48a1c28cd10494 |
2 |
Author: hwoarang <hwoarang <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 26 10:49:15 2011 +0000 |
4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 26 10:49:15 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=107a37c0 |
7 |
|
8 |
Moving boost-1.47 to gx86 |
9 |
|
10 |
--- |
11 |
dev-libs/boost/Manifest | 27 ++- |
12 |
dev-libs/boost/boost-1.47.0.ebuild | 487 ------------------------ |
13 |
dev-util/boost-build/Manifest | 7 +- |
14 |
dev-util/boost-build/boost-build-1.47.0.ebuild | 114 ------ |
15 |
profiles/package.mask | 5 - |
16 |
5 files changed, 32 insertions(+), 608 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest |
19 |
index 32a62ea..b4f8fd2 100644 |
20 |
--- a/dev-libs/boost/Manifest |
21 |
+++ b/dev-libs/boost/Manifest |
22 |
@@ -1 +1,26 @@ |
23 |
-DIST boost_1_47_0.tar.bz2 518705 RMD160 b02ffbea6a2d862a0a8800b749bb5f40f171ec72 SHA1 61281cd9923599c72f118e60fbe23dd2bedd3461 SHA256 997dd493b90d21324b8bbad53288f60eea8f3fe9d84842cb3f9c7134838a66d5 |
24 |
+AUX 1.35-remove-hardlink-creation.patch 547 RMD160 0c0bae87977869efcd2e25144b910025ab3e6924 SHA1 c3833411ab8e7c84efddc5cfb4ab99abcba1eed5 SHA256 9b0515f343f0c8f7f0ce51e2c6f243edae0f3d5ce5df5b9f77a46b00041a134e |
25 |
+AUX boost-1.37.0-darwin-long-double.patch 556 RMD160 54b1111e9dbc51131f01f50071f1c4f337b35d2f SHA1 827dcef39cf884948c3720ae1d94d1b5b5279578 SHA256 0beb2bf9ae43ad86c307873ab19b049152ef7798ba17523638cdb78017642c31 |
26 |
+AUX boost-1.41.0-fix-CRC-on-x64-during-gzip-decompression.patch 1030 RMD160 8cf63aa1179ed4d8e3a79fb3f00b6c8f3db816f0 SHA1 028d0d2611392a68b35403f089486963d7d4e549 SHA256 4b935fe0b3c9f3a2b1fcedda048b0ebc518531aa143f95cdd1b7fa51de1133d4 |
27 |
+AUX boost-1.41.0-iostreams-missing-include-guard.patch 813 RMD160 3a8e5e7f1635d784da3680c30c8f7c692bc26be0 SHA1 7f701c2d7c186d1cf72f9a9adf36409650ca964a SHA256 5b495a10b9cfca17c5d5f5de6e9f10527e67e999145d115349cc87721f2f3613 |
28 |
+AUX boost-1.41.0-mpi_process_group-missing-include.patch 448 RMD160 415f9e7d9195b8d3796524285e090230831466a1 SHA1 7cca39a7847f9d6c4fe0d30f5c677774576db5d3 SHA256 0d5a09e3dc170afd4756fbb296f1a0c30438cc7fb4a771dc7b91763c88e8f88d |
29 |
+AUX boost-1.41.0-parameter-needs-python.patch 3037 RMD160 901d7bdda6c9f604d5487b09d247592e8558fcfa SHA1 ee3bf830495506e6d250b2073efbf42de60f9d03 SHA256 0d0e47ef2582da43c40ccf8b5b58435a2d42e2236d29ea7883e1b1ecd1aaa439 |
30 |
+AUX boost-1.41.0-spirit-fixed-include-guard-conflict.patch 613 RMD160 434235581f62a4fa569cb6425b7718f866a52ed4 SHA1 39738e64e9e935914a132f899cab8310fe3bb273 SHA256 83c7b2b00225433f82a78c86e3959e56e8529443d769ba35ebef02b4c2c26888 |
31 |
+AUX boost-1.42.0-gcc45-python.patch 628 RMD160 261b0e98f133fd745e29998bd0f0165f0a007ab3 SHA1 80146b1018e96b0958d930e2a8c828310ffec68a SHA256 5ab528cfc9beb940d6cfa94ff1b39b0e29c6adc3c1d1906f31cfabaf94232761 |
32 |
+AUX boost-1.42.0-parameter-needs-python.patch 3037 RMD160 901d7bdda6c9f604d5487b09d247592e8558fcfa SHA1 ee3bf830495506e6d250b2073efbf42de60f9d03 SHA256 0d0e47ef2582da43c40ccf8b5b58435a2d42e2236d29ea7883e1b1ecd1aaa439 |
33 |
+AUX boost-1.42.0-template_arity-gcc45.patch 970 RMD160 0edcdbcaf0165e4e285b041f6406b1f71e798753 SHA1 f0cccc3ba7c2496f092cbc623473d21585bdd304 SHA256 e289a56bed08914704fad58bc4779ce9f327b4acac8ebd6a93bc6dd09f9a6e98 |
34 |
+AUX boost-1.45.0-lambda_bind.patch 1607 RMD160 ea61aaac83cfebfcb10c0e20de72022d4d4c1b27 SHA1 39856bef27d2a55f1ae2e0d7a7005264a8613289 SHA256 0ff6a7bf481d5311ec57be1eeaafdd0c0e9e0c09b896700d40295f67bf77be0b |
35 |
+AUX boost-1.46.1-python32.patch 579 RMD160 bf659da8646379b73ce255d2432467724c33c4be SHA1 0d3f2896ca46179cf2138fa4571fb48f5f496a2d SHA256 6227eb2692777b70896fe63a6726b630239b07845f4ae1ae57d2e83a062dc57e |
36 |
+AUX buildid-fix.patch 1045 RMD160 ce9dbea25e21ed1ac177b16982ef1850957474f2 SHA1 af1069055e6f8d8fa143fb2ddeccb2fc36ddce9a SHA256 42a2aa4c0f4d8579a501d6133f55852acbd1d7b497598983c50bdebaa17df17f |
37 |
+AUX point_release_naming_fix.patch 389 RMD160 a58388a1e52ce1a05a3259295fccbc8399a95f67 SHA1 7c1b5b0c75fb134599cc2a167e5e5a2799b273c5 SHA256 c26a9582d85bbbfde2ecdb36562fdddafc30389205f105508350b4720aa5b576 |
38 |
+AUX random-Jamfile 355 RMD160 478b592e9d33d371b07e5364e63512c8208263bf SHA1 8ca047df78758f62a6c131bd27441173e9079fa6 SHA256 7dc71ab8b862ccd5ea9c21c42557adfe0c711ea7fbe7faa47328a37aa84bc096 |
39 |
+AUX random-Jamfile-1.45.0 358 RMD160 dd8a847d5104923006795c9a19fa9154e49a8894 SHA1 a3d8cc42b95a09a451c2a1c429e019288f3b76aa SHA256 412c26f915db9d2664305d596406f6a75132d8cfe1827b42f17dc083dc632f00 |
40 |
+AUX random-Jamfile-1.46.1 358 RMD160 dd8a847d5104923006795c9a19fa9154e49a8894 SHA1 a3d8cc42b95a09a451c2a1c429e019288f3b76aa SHA256 412c26f915db9d2664305d596406f6a75132d8cfe1827b42f17dc083dc632f00 |
41 |
+AUX random-Jamfile-1.47.0 358 RMD160 dd8a847d5104923006795c9a19fa9154e49a8894 SHA1 a3d8cc42b95a09a451c2a1c429e019288f3b76aa SHA256 412c26f915db9d2664305d596406f6a75132d8cfe1827b42f17dc083dc632f00 |
42 |
+AUX remove-toolset-1.41.0.patch 465 RMD160 5d93141f9cf98fc558e15c273d4ede298a96d535 SHA1 0533de67dd64cf96c992a05161fc8dc6cff3453e SHA256 e1b3c77d5116722df5c5a48973f95307fd46fea675d53d268d60548b7ac4bd2b |
43 |
+AUX remove-toolset-1.42.0.patch 465 RMD160 5d93141f9cf98fc558e15c273d4ede298a96d535 SHA1 0533de67dd64cf96c992a05161fc8dc6cff3453e SHA256 e1b3c77d5116722df5c5a48973f95307fd46fea675d53d268d60548b7ac4bd2b |
44 |
+AUX remove-toolset-1.45.0.patch 465 RMD160 18b160e97e183392a635ebc60f840d10c30a0b1b SHA1 e476d9b06e7e16499ee7659f5178a52564d6831a SHA256 c1cc35cd5e25160e481912dcdd1e45a86d518bb0ac009ad50bd3811b097226b7 |
45 |
+AUX remove-toolset-1.46.1.patch 465 RMD160 18b160e97e183392a635ebc60f840d10c30a0b1b SHA1 e476d9b06e7e16499ee7659f5178a52564d6831a SHA256 c1cc35cd5e25160e481912dcdd1e45a86d518bb0ac009ad50bd3811b097226b7 |
46 |
+AUX remove-toolset-1.47.0.patch 475 RMD160 affc424b21d5f72f164549a924530fc97ed161f3 SHA1 a16fbb8e43b1fdb650eac0440f3e2d0bc359c55b SHA256 c16838de102445b12c6fc3818d1b1c82adddeb639f05fb3493c15a25ce8b48fa |
47 |
+AUX remove_toolset_from_targetname.patch 490 RMD160 e050992fd79005af73410a2ea4037a82177ddf33 SHA1 80d96cca8cb0acb752c428ffcada3ef2964642b1 SHA256 5c5c6fea3c1e20e290d15a68f91b6c084cc5b34daae338e3aa0879a3fd5b9fb5 |
48 |
+MISC ChangeLog 34329 RMD160 0306158a378f23758596a5da4be57fffe177009d SHA1 7a0ccd8b5ec8b83e236658d056a70246a2de3d9a SHA256 b9d2b41afe5044f4daf1d1a8a29dcdc2f5e7ff12d48efe1e8b5414679ec41eba |
49 |
+MISC metadata.xml 773 RMD160 3f4c57fa2861bb416fc5d92d839c41acb2b9861a SHA1 6c90f699901853658c41fbfdb3661eb617682040 SHA256 6563b78be463b4ae931f3dc07d5cd280281bf168c07ecea59fe5dc946f2d0ecf |
50 |
|
51 |
diff --git a/dev-libs/boost/boost-1.47.0.ebuild b/dev-libs/boost/boost-1.47.0.ebuild |
52 |
deleted file mode 100644 |
53 |
index e6a4bd6..0000000 |
54 |
--- a/dev-libs/boost/boost-1.47.0.ebuild |
55 |
+++ /dev/null |
56 |
@@ -1,487 +0,0 @@ |
57 |
-# Copyright 1999-2011 Gentoo Foundation |
58 |
-# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.46.1.ebuild,v 1.5 2011/05/15 19:59:21 mr_bones_ Exp $ |
60 |
- |
61 |
-EAPI="2" |
62 |
- |
63 |
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs |
64 |
- |
65 |
-MY_P=${PN}_$(replace_all_version_separators _) |
66 |
- |
67 |
-DESCRIPTION="Boost Libraries for C++" |
68 |
-HOMEPAGE="http://www.boost.org/" |
69 |
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2" |
70 |
-LICENSE="Boost-1.0" |
71 |
-SLOT="$(get_version_component_range 1-2)" |
72 |
-IUSE="debug doc +eselect icu mpi python static-libs test tools" |
73 |
- |
74 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
75 |
- |
76 |
-RDEPEND="icu? ( >=dev-libs/icu-3.3 ) |
77 |
- mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) |
78 |
- sys-libs/zlib |
79 |
- python? ( dev-lang/python ) |
80 |
- !!<=dev-libs/boost-1.35.0-r2 |
81 |
- >=app-admin/eselect-boost-0.3" |
82 |
-DEPEND="${RDEPEND} |
83 |
- dev-util/boost-build:${SLOT}" |
84 |
- |
85 |
-S=${WORKDIR}/${MY_P} |
86 |
- |
87 |
-MAJOR_PV=$(replace_all_version_separators _ ${SLOT}) |
88 |
-BJAM="b2-${MAJOR_PV}" |
89 |
- |
90 |
-# Usage: |
91 |
-# _add_line <line-to-add> <profile> |
92 |
-# ... to add to specific profile |
93 |
-# or |
94 |
-# _add_line <line-to-add> |
95 |
-# ... to add to all profiles for which the use flag set |
96 |
- |
97 |
-_add_line() { |
98 |
- if [ -z "$2" ] ; then |
99 |
- echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" |
100 |
- use debug && echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" |
101 |
- else |
102 |
- echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}" |
103 |
- fi |
104 |
-} |
105 |
- |
106 |
-pkg_setup() { |
107 |
- # It doesn't compile with USE="python mpi" and python-3 (bug 295705) |
108 |
- if use python && use mpi ; then |
109 |
- if [[ "$(python_get_version --major)" != "2" ]]; then |
110 |
- eerror "The Boost.MPI python bindings do not support any other python version" |
111 |
- eerror "than 2.x. Please either use eselect to select a python 2.x version or" |
112 |
- eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}." |
113 |
- die "unsupported python version" |
114 |
- fi |
115 |
- fi |
116 |
- |
117 |
- if use test ; then |
118 |
- CHECKREQS_DISK_BUILD="15360" |
119 |
- check_reqs |
120 |
- |
121 |
- ewarn "The tests may take several hours on a recent machine" |
122 |
- ewarn "but they will not fail (unless something weird happens ;-)" |
123 |
- ewarn "This is because the tests depend on the used compiler/-version" |
124 |
- ewarn "and the platform and upstream says that this is normal." |
125 |
- ewarn "If you are interested in the results, please take a look at the" |
126 |
- ewarn "generated results page:" |
127 |
- ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html" |
128 |
- ebeep 5 |
129 |
- |
130 |
- fi |
131 |
- |
132 |
- if use debug ; then |
133 |
- ewarn "The debug USE-flag means that a second set of the boost libraries" |
134 |
- ewarn "will be built containing debug-symbols. You'll be able to select them" |
135 |
- ewarn "using the boost-eselect module. But even though the optimization flags" |
136 |
- ewarn "you might have set are not stripped, there will be a performance" |
137 |
- ewarn "penalty and linking other packages against the debug version" |
138 |
- ewarn "of boost is _not_ recommended." |
139 |
- fi |
140 |
-} |
141 |
- |
142 |
-src_prepare() { |
143 |
- epatch "${FILESDIR}/remove-toolset-${PV}.patch" |
144 |
- |
145 |
- # This enables building the boost.random library with /dev/urandom support |
146 |
- if [[ -e /dev/urandom ]] ; then |
147 |
- mkdir -p libs/random/build || die |
148 |
- cp "${FILESDIR}/random-Jamfile-${PV}" libs/random/build/Jamfile.v2 || die |
149 |
- fi |
150 |
-} |
151 |
- |
152 |
-src_configure() { |
153 |
- einfo "Writing new user-config.jam" |
154 |
- |
155 |
- local compiler compilerVersion compilerExecutable mpi |
156 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
157 |
- compiler=darwin |
158 |
- compilerVersion=$(gcc-fullversion) |
159 |
- compilerExecutable=$(tc-getCXX) |
160 |
- # we need to add the prefix, and in two cases this exceeds, so prepare |
161 |
- # for the largest possible space allocation |
162 |
- append-ldflags -Wl,-headerpad_max_install_names |
163 |
- else |
164 |
- compiler=gcc |
165 |
- compilerVersion=$(gcc-version) |
166 |
- compilerExecutable=$(tc-getCXX) |
167 |
- fi |
168 |
- |
169 |
- # Using -fno-strict-aliasing to prevent possible creation of invalid code. |
170 |
- append-flags -fno-strict-aliasing |
171 |
- |
172 |
- # bug 298489 |
173 |
- if use ppc || use ppc64 ; then |
174 |
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec |
175 |
- fi; |
176 |
- |
177 |
- use mpi && mpi="using mpi ;" |
178 |
- |
179 |
- if use python ; then |
180 |
- pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;" |
181 |
- fi |
182 |
- |
183 |
- cat > "${S}/user-config.jam" << __EOF__ |
184 |
- |
185 |
-variant gentoorelease : release : <optimization>none <debug-symbols>none ; |
186 |
-variant gentoodebug : debug : <optimization>none ; |
187 |
- |
188 |
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; |
189 |
- |
190 |
-${pystring} |
191 |
- |
192 |
-${mpi} |
193 |
- |
194 |
-__EOF__ |
195 |
- |
196 |
- # Maintainer information: |
197 |
- # The debug-symbols=none and optimization=none |
198 |
- # are not official upstream flags but a Gentoo |
199 |
- # specific patch to make sure that all our |
200 |
- # CXXFLAGS/LDFLAGS are being respected. |
201 |
- # Using optimization=off would for example add |
202 |
- # "-O0" and override "-O2" set by the user. |
203 |
- # Please take a look at the boost-build ebuild |
204 |
- # for more infomration. |
205 |
- |
206 |
- use icu && OPTIONS="-sICU_PATH=/usr" |
207 |
- use icu || OPTIONS="--disable-icu" |
208 |
- use mpi || OPTIONS="${OPTIONS} --without-mpi" |
209 |
- use python || OPTIONS="${OPTIONS} --without-python" |
210 |
- |
211 |
- # https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch |
212 |
- if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then |
213 |
- OPTIONS="${OPTIONS} --disable-long-double" |
214 |
- fi |
215 |
- |
216 |
- OPTIONS="${OPTIONS} pch=off --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned" |
217 |
- |
218 |
- if use static-libs ; then |
219 |
- LINK_OPTS="link=shared,static" |
220 |
- LIBRARY_TARGETS="*.a *$(get_libname)" |
221 |
- else |
222 |
- LINK_OPTS="link=shared" |
223 |
- #there is no dynamicly linked version of libboost_test_exec_monitor and libboost_exception |
224 |
- LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)" |
225 |
- fi |
226 |
-} |
227 |
- |
228 |
-src_compile() { |
229 |
- jobs=$( echo " ${MAKEOPTS} " | \ |
230 |
- sed -e 's/ --jobs[= ]/ -j /g' \ |
231 |
- -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ |
232 |
- -e 's/ -j\>/ -j1/g' | \ |
233 |
- ( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) ) |
234 |
- if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; |
235 |
- |
236 |
- export BOOST_ROOT="${S}" |
237 |
- |
238 |
- einfo "Using the following command to build: " |
239 |
- einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared" |
240 |
- |
241 |
- ${BJAM} ${NUMJOBS} -q -d+2 \ |
242 |
- gentoorelease \ |
243 |
- ${OPTIONS} \ |
244 |
- threading=single,multi ${LINK_OPTS} runtime-link=shared \ |
245 |
- || die "building boost failed" |
246 |
- |
247 |
- # ... and do the whole thing one more time to get the debug libs |
248 |
- if use debug ; then |
249 |
- einfo "Using the following command to build: " |
250 |
- einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug" |
251 |
- |
252 |
- ${BJAM} ${NUMJOBS} -q -d+2 \ |
253 |
- gentoodebug \ |
254 |
- ${OPTIONS} \ |
255 |
- threading=single,multi ${LINK_OPTS} runtime-link=shared \ |
256 |
- --buildid=debug \ |
257 |
- || die "building boost failed" |
258 |
- fi |
259 |
- |
260 |
- if use tools; then |
261 |
- cd "${S}/tools/" |
262 |
- einfo "Using the following command to build the tools: " |
263 |
- einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS}" |
264 |
- |
265 |
- ${BJAM} ${NUMJOBS} -q -d+2\ |
266 |
- gentoorelease \ |
267 |
- ${OPTIONS} \ |
268 |
- || die "building tools failed" |
269 |
- fi |
270 |
- |
271 |
-} |
272 |
- |
273 |
-src_install () { |
274 |
- export BOOST_ROOT="${S}" |
275 |
- |
276 |
- einfo "Using the following command to install: " |
277 |
- einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install" |
278 |
- |
279 |
- ${BJAM} -q -d+2 \ |
280 |
- gentoorelease \ |
281 |
- ${OPTIONS} \ |
282 |
- threading=single,multi ${LINK_OPTS} runtime-link=shared \ |
283 |
- --includedir="${D}/usr/include" \ |
284 |
- --libdir="${D}/usr/$(get_libdir)" \ |
285 |
- install || die "install failed for options '${OPTIONS}'" |
286 |
- |
287 |
- if use debug ; then |
288 |
- einfo "Using the following command to install: " |
289 |
- einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug" |
290 |
- |
291 |
- ${BJAM} -q -d+2 \ |
292 |
- gentoodebug \ |
293 |
- ${OPTIONS} \ |
294 |
- threading=single,multi ${LINK_OPTS} runtime-link=shared \ |
295 |
- --includedir="${D}/usr/include" \ |
296 |
- --libdir="${D}/usr/$(get_libdir)" \ |
297 |
- --buildid=debug \ |
298 |
- install || die "install failed for options '${OPTIONS}'" |
299 |
- fi |
300 |
- |
301 |
- use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python* || die |
302 |
- |
303 |
- dodir /usr/share/boost-eselect/profiles/${SLOT} || die |
304 |
- touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" || die |
305 |
- if use debug ; then |
306 |
- touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" || die |
307 |
- fi |
308 |
- |
309 |
- # Move the mpi.so to the right place and make sure it's slotted |
310 |
- if use mpi && use python; then |
311 |
- mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die |
312 |
- mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" || die |
313 |
- touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die |
314 |
- _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\"" |
315 |
- fi |
316 |
- |
317 |
- if use doc ; then |
318 |
- find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf |
319 |
- dohtml \ |
320 |
- -A pdf,txt,cpp,hpp \ |
321 |
- *.{htm,html,png,css} \ |
322 |
- -r doc || die |
323 |
- dohtml \ |
324 |
- -A pdf,txt \ |
325 |
- -r tools || die |
326 |
- insinto /usr/share/doc/${PF}/html |
327 |
- doins -r libs || die |
328 |
- doins -r more || die |
329 |
- |
330 |
- # To avoid broken links |
331 |
- insinto /usr/share/doc/${PF}/html |
332 |
- doins LICENSE_1_0.txt || die |
333 |
- |
334 |
- dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost || die |
335 |
- fi |
336 |
- |
337 |
- cd "${D}/usr/$(get_libdir)" || die |
338 |
- |
339 |
- # Remove (unversioned) symlinks |
340 |
- # And check for what we remove to catch bugs |
341 |
- # got a better idea how to do it? tell me! |
342 |
- for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}") ; do |
343 |
- if [ ! -h "${f}" ] ; then |
344 |
- eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink" |
345 |
- die "slotting/naming of the libs broken!" |
346 |
- fi |
347 |
- rm "${f}" || die |
348 |
- done |
349 |
- |
350 |
- # The threading libs obviously always gets the "-mt" (multithreading) tag |
351 |
- # some packages seem to have a problem with it. Creating symlinks... |
352 |
- |
353 |
- if use static-libs ; then |
354 |
- THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)" |
355 |
- else |
356 |
- THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)" |
357 |
- fi |
358 |
- for lib in ${THREAD_LIBS} ; do |
359 |
- dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die |
360 |
- done |
361 |
- |
362 |
- # The same goes for the mpi libs |
363 |
- if use mpi ; then |
364 |
- if use static-libs ; then |
365 |
- MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)" |
366 |
- else |
367 |
- MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)" |
368 |
- fi |
369 |
- for lib in ${MPI_LIBS} ; do |
370 |
- dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die |
371 |
- done |
372 |
- fi |
373 |
- |
374 |
- if use debug ; then |
375 |
- if use static-libs ; then |
376 |
- THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a" |
377 |
- else |
378 |
- THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)" |
379 |
- fi |
380 |
- |
381 |
- for lib in ${THREAD_DEBUG_LIBS} ; do |
382 |
- dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die |
383 |
- done |
384 |
- |
385 |
- if use mpi ; then |
386 |
- if use static-libs ; then |
387 |
- MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)" |
388 |
- else |
389 |
- MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)" |
390 |
- fi |
391 |
- |
392 |
- for lib in ${MPI_DEBUG_LIBS} ; do |
393 |
- dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die |
394 |
- done |
395 |
- fi |
396 |
- fi |
397 |
- |
398 |
- # Create a subdirectory with completely unversioned symlinks |
399 |
- # and store the names in the profiles-file for eselect |
400 |
- dodir /usr/$(get_libdir)/boost-${MAJOR_PV} || die |
401 |
- |
402 |
- _add_line "libs=\"" default |
403 |
- for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug) ; do |
404 |
- dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}} || die |
405 |
- _add_line "/usr/$(get_libdir)/${f}" default |
406 |
- done |
407 |
- _add_line "\"" default |
408 |
- |
409 |
- if use debug ; then |
410 |
- _add_line "libs=\"" debug |
411 |
- dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug || die |
412 |
- for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug) ; do |
413 |
- dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug} || die |
414 |
- _add_line "/usr/$(get_libdir)/${f}" debug |
415 |
- done |
416 |
- _add_line "\"" debug |
417 |
- |
418 |
- _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug |
419 |
- _add_line "suffix=\"-debug\"" debug |
420 |
- fi |
421 |
- |
422 |
- _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default |
423 |
- |
424 |
- if use tools; then |
425 |
- cd "${S}/dist/bin" || die |
426 |
- # Append version postfix to binaries for slotting |
427 |
- _add_line "bins=\"" |
428 |
- for b in * ; do |
429 |
- newbin "${b}" "${b}-${MAJOR_PV}" || die |
430 |
- _add_line "/usr/bin/${b}-${MAJOR_PV}" |
431 |
- done |
432 |
- _add_line "\"" |
433 |
- |
434 |
- cd "${S}/dist" || die |
435 |
- insinto /usr/share || die |
436 |
- doins -r share/boostbook || die |
437 |
- # Append version postfix for slotting |
438 |
- mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}" || die |
439 |
- _add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\"" |
440 |
- fi |
441 |
- |
442 |
- cd "${S}/status" || die |
443 |
- if [ -f regress.log ] ; then |
444 |
- docinto status || die |
445 |
- dohtml *.html ../boost.png || die |
446 |
- dodoc regress.log || die |
447 |
- fi |
448 |
- |
449 |
- use python && python_need_rebuild |
450 |
- |
451 |
- # boost's build system truely sucks for not having a destdir. Because for |
452 |
- # this reason we are forced to build with a prefix that includes the |
453 |
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the |
454 |
- # DESTROOT instread of the actual EPREFIX. There is no way out of here |
455 |
- # but to do it the dirty way of manually setting the right install_names. |
456 |
- [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/ |
457 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
458 |
- einfo "Working around completely broken build-system(tm)" |
459 |
- for d in "${ED}"usr/lib/*.dylib ; do |
460 |
- if [[ -f ${d} ]] ; then |
461 |
- # fix the "soname" |
462 |
- ebegin " correcting install_name of ${d#${ED}}" |
463 |
- install_name_tool -id "/${d#${D}}" "${d}" |
464 |
- eend $? |
465 |
- # fix references to other libs |
466 |
- refs=$(otool -XL "${d}" | \ |
467 |
- sed -e '1d' -e 's/^\t//' | \ |
468 |
- grep "^libboost_" | \ |
469 |
- cut -f1 -d' ') |
470 |
- for r in ${refs} ; do |
471 |
- ebegin " correcting reference to ${r}" |
472 |
- install_name_tool -change \ |
473 |
- "${r}" \ |
474 |
- "${EPREFIX}/usr/lib/${r}" \ |
475 |
- "${d}" |
476 |
- eend $? |
477 |
- done |
478 |
- fi |
479 |
- done |
480 |
- fi |
481 |
-} |
482 |
- |
483 |
-src_test() { |
484 |
- export BOOST_ROOT=${S} |
485 |
- |
486 |
- cd "${S}/tools/regression/build" || die |
487 |
- einfo "Using the following command to build test helpers: " |
488 |
- einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} process_jam_log compiler_status" |
489 |
- |
490 |
- ${BJAM} -q -d+2 \ |
491 |
- gentoorelease \ |
492 |
- ${OPTIONS} \ |
493 |
- process_jam_log compiler_status \ |
494 |
- || die "building regression test helpers failed" |
495 |
- |
496 |
- cd "${S}/status" || die |
497 |
- |
498 |
- # Some of the test-checks seem to rely on regexps |
499 |
- export LC_ALL="C" |
500 |
- |
501 |
- # The following is largely taken from tools/regression/run_tests.sh, |
502 |
- # but adapted to our needs. |
503 |
- |
504 |
- # Run the tests & write them into a file for postprocessing |
505 |
- einfo "Using the following command to test: " |
506 |
- einfo "${BJAM} ${OPTIONS} --dump-tests" |
507 |
- |
508 |
- ${BJAM} \ |
509 |
- ${OPTIONS} \ |
510 |
- --dump-tests 2>&1 | tee regress.log || die |
511 |
- |
512 |
- # Postprocessing |
513 |
- cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/process_jam_log" --v2 |
514 |
- if test $? != 0 ; then |
515 |
- die "Postprocessing the build log failed" |
516 |
- fi |
517 |
- |
518 |
- cat > "${S}/status/comment.html" <<- __EOF__ |
519 |
- <p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p> |
520 |
-__EOF__ |
521 |
- |
522 |
- # Generate the build log html summary page |
523 |
- "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/compiler_status" --v2 \ |
524 |
- --comment "${S}/status/comment.html" "${S}" \ |
525 |
- cs-$(uname).html cs-$(uname)-links.html |
526 |
- if test $? != 0 ; then |
527 |
- die "Generating the build log html summary page failed" |
528 |
- fi |
529 |
- |
530 |
- # And do some cosmetic fixes :) |
531 |
- sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die |
532 |
-} |
533 |
- |
534 |
-pkg_postinst() { |
535 |
- if use eselect ; then |
536 |
- eselect boost update || ewarn "eselect boost update failed." |
537 |
- fi |
538 |
- |
539 |
- if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then |
540 |
- elog "No active boost version found. Calling eselect to select one..." |
541 |
- eselect boost update || ewarn "eselect boost update failed." |
542 |
- fi |
543 |
-} |
544 |
|
545 |
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest |
546 |
index 32a62ea..3da4c26 100644 |
547 |
--- a/dev-util/boost-build/Manifest |
548 |
+++ b/dev-util/boost-build/Manifest |
549 |
@@ -1 +1,6 @@ |
550 |
-DIST boost_1_47_0.tar.bz2 518705 RMD160 b02ffbea6a2d862a0a8800b749bb5f40f171ec72 SHA1 61281cd9923599c72f118e60fbe23dd2bedd3461 SHA256 997dd493b90d21324b8bbad53288f60eea8f3fe9d84842cb3f9c7134838a66d5 |
551 |
+AUX 1.35.0-fix_broken_icu_build.patch 1752 RMD160 0e7ee05c17d76e29abff915e84181361e4095b89 SHA1 273de1fa957091bf3c0d041f54aec9797810f3cf SHA256 71d858236c47b835947d996d3caf0a1de96ace267140d52dd09594db3a96729d |
552 |
+AUX boost-1.41-fix-mpich2-detection.patch 1378 RMD160 fd81c6a03dd8bf2d6afdaf3fa4957ee0ff1f6e10 SHA1 bbe5ba6fb554ab89e5fa4649f8a44ad7cd1dfa80 SHA256 8e1adadb1345ff045930bbd1c6d9d6e4b06462de2939021bf9e3a3fe1c9d6100 |
553 |
+AUX boost-1.42-fix-mpich2-detection.patch 1378 RMD160 fd81c6a03dd8bf2d6afdaf3fa4957ee0ff1f6e10 SHA1 bbe5ba6fb554ab89e5fa4649f8a44ad7cd1dfa80 SHA256 8e1adadb1345ff045930bbd1c6d9d6e4b06462de2939021bf9e3a3fe1c9d6100 |
554 |
+AUX boost-build-1.42-env-whitespace.patch 683 RMD160 a96ff55a09a889c5fba0c898cc7d4c2a6d2ef1a5 SHA1 9fd231fc699813df1d3ba78ae95f5f322166ade7 SHA256 52714f45a54cad8c126d5fca8bd5eacc4d746b29df24aaa9d2c55e3694a6f4aa |
555 |
+MISC ChangeLog 9527 RMD160 2b4a1a101b2d2e76640223160af278cee3e1057d SHA1 96a1d16156b855c63b0dfe00719ce47670b2d8ac SHA256 ef9d1eeb5340c2150c7f852a12b935161f8dae0dc1964b12e9a9f126d296beb0 |
556 |
+MISC metadata.xml 467 RMD160 46a5b92ef812d514cce62b4a7d6644597c137bf9 SHA1 c47d4a412061b3fe75a2ac875542bc6f1ea4d269 SHA256 45d1630f3fe0286a9ea6cb8cb04ec73ae7f4b7fd52f413e423fce4c436c23f6a |
557 |
|
558 |
diff --git a/dev-util/boost-build/boost-build-1.47.0.ebuild b/dev-util/boost-build/boost-build-1.47.0.ebuild |
559 |
deleted file mode 100644 |
560 |
index e566747..0000000 |
561 |
--- a/dev-util/boost-build/boost-build-1.47.0.ebuild |
562 |
+++ /dev/null |
563 |
@@ -1,114 +0,0 @@ |
564 |
-# Copyright 1999-2011 Gentoo Foundation |
565 |
-# Distributed under the terms of the GNU General Public License v2 |
566 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.46.1.ebuild,v 1.2 2011/07/10 15:15:48 aballier Exp $ |
567 |
- |
568 |
-EAPI="2" |
569 |
- |
570 |
-inherit eutils flag-o-matic toolchain-funcs versionator |
571 |
- |
572 |
-MY_PV=$(replace_all_version_separators _) |
573 |
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))" |
574 |
- |
575 |
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful." |
576 |
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html" |
577 |
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2" |
578 |
-LICENSE="Boost-1.0" |
579 |
-SLOT="$(get_version_component_range 1-2)" |
580 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
581 |
-IUSE="examples python" |
582 |
- |
583 |
-DEPEND="!<dev-libs/boost-1.34.0 |
584 |
- !<=dev-util/boost-build-1.35.0-r1 |
585 |
- python? ( dev-lang/python )" |
586 |
-RDEPEND="${DEPEND}" |
587 |
- |
588 |
-S="${WORKDIR}/boost_${MY_PV}/tools/build/v2" |
589 |
- |
590 |
-src_unpack() { |
591 |
- tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed" |
592 |
-} |
593 |
- |
594 |
-src_prepare() { |
595 |
- # TODO: |
596 |
- # epatch "${FILESDIR}/boost-1.42-fix-mpich2-detection.patch" |
597 |
- |
598 |
- cd "${S}/engine" |
599 |
- epatch "${FILESDIR}/${PN}-1.42-env-whitespace.patch" # 293652 |
600 |
- |
601 |
- # Remove stripping option |
602 |
- cd "${S}/engine" |
603 |
- sed -i -e 's|-s\b||' \ |
604 |
- build.jam || die "sed failed" |
605 |
- |
606 |
- # Force regeneration |
607 |
- rm jambase.c || die |
608 |
- |
609 |
- # This patch allows us to fully control optimization |
610 |
- # and stripping flags when bjam is used as build-system |
611 |
- # We simply extend the optimization and debug-symbols feature |
612 |
- # with empty dummies called 'none' |
613 |
- cd "${S}" |
614 |
- sed -i \ |
615 |
- -e 's/\(off speed space\)/\1 none/' \ |
616 |
- -e 's/\(debug-symbols : on off\)/\1 none/' \ |
617 |
- tools/builtin.jam || die "sed failed" |
618 |
-} |
619 |
- |
620 |
-src_compile() { |
621 |
- cd engine |
622 |
- local toolset |
623 |
- |
624 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
625 |
- toolset=darwin |
626 |
- else |
627 |
- # Using boost's generic toolset here, which respects CC and CFLAGS |
628 |
- toolset=cc |
629 |
- fi |
630 |
- |
631 |
- # For slotting |
632 |
- sed -i \ |
633 |
- -e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \ |
634 |
- Jambase || die "sed failed" |
635 |
- |
636 |
- # The build.jam file for building bjam using a bootstrapped jam0 ignores |
637 |
- # the LDFLAGS env var (bug #209794). We have now two options: |
638 |
- # a) change the cc-target definition in build.jam to include separate compile |
639 |
- # and link targets to make it use the LDFLAGS var, or |
640 |
- # b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var |
641 |
- # (which should not be set by us). |
642 |
- if [[ -z "${LDFLAGS}" ]] ; then |
643 |
- CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \ |
644 |
- || die "building bjam failed" |
645 |
- else |
646 |
- LDFLAGS=$(echo ${LDFLAGS}) # 293652 |
647 |
- LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \ |
648 |
- $(use_with python) || die "building bjam failed" |
649 |
- fi |
650 |
-} |
651 |
- |
652 |
-src_install() { |
653 |
- newbin engine/bin.*/bjam bjam-${MAJOR_PV} |
654 |
- newbin engine/bin.*/b2 b2-${MAJOR_PV} |
655 |
- |
656 |
- cd "${S}" |
657 |
- insinto /usr/share/boost-build-${MAJOR_PV} |
658 |
- doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \ |
659 |
- build kernel options tools util || die |
660 |
- |
661 |
- dodoc changes.txt hacking.txt release_procedure.txt \ |
662 |
- notes/build_dir_option.txt notes/relative_source_paths.txt |
663 |
- |
664 |
- if use examples ; then |
665 |
- insinto /usr/share/doc/${PF} |
666 |
- doins -r example |
667 |
- fi |
668 |
-} |
669 |
- |
670 |
-src_test() { |
671 |
- cd test/engine |
672 |
- |
673 |
- FIXME: Replace the ls call with the proper way of doing this. |
674 |
- |
675 |
- BJAM_BIN=$(ls ../../engine/bin.*/b2) |
676 |
- ${BJAM_BIN} -f test.jam "-sBJAM=${BJAM_BIN}" || die "tests failed" |
677 |
-} |
678 |
|
679 |
diff --git a/profiles/package.mask b/profiles/package.mask |
680 |
index f644bde..7161cdb 100644 |
681 |
--- a/profiles/package.mask |
682 |
+++ b/profiles/package.mask |
683 |
@@ -1,8 +1,3 @@ |
684 |
-# Markos Chandras <hwoarang@g.o> (1 Aug 2011) |
685 |
-# Masked for testing |
686 |
-=dev-libs/boost-1.47.0 |
687 |
-=dev-util/boost-build-1.47.0 |
688 |
- |
689 |
# Markos Chandras <hwoarang@g.o> (19 May 2011) |
690 |
# Totally broken but feel free to provide patches |
691 |
# Bug: #364071 |