summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/boost/Manifest4
-rw-r--r--dev-libs/boost/boost-1.37.0.ebuild20
2 files changed, 13 insertions, 11 deletions
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 66dd73f..7b6fa70 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -2,10 +2,10 @@ AUX random-Jamfile 355 RMD160 478b592e9d33d371b07e5364e63512c8208263bf SHA1 8ca0
AUX remove_toolset_from_targetname.patch 490 RMD160 e050992fd79005af73410a2ea4037a82177ddf33 SHA1 80d96cca8cb0acb752c428ffcada3ef2964642b1 SHA256 5c5c6fea3c1e20e290d15a68f91b6c084cc5b34daae338e3aa0879a3fd5b9fb5
DIST boost-patches-1.35.0-4.tbz2 4885 RMD160 e24b4fc68c7c32970a3876c4bf68c662983a8ddd SHA1 2b276a9affda23abc46e8873d1b99991849be18f SHA256 779ea472fa800afac976c226656b3a95ef2b22832bbd8823634e4d6e7969a3da
DIST boost-patches-1.36.0-1.tbz2 1392 RMD160 d179db21115da98def22fe41a6cad84e3eb776bc SHA1 3aa5733bff99f1922e792ea0dec06973a4bdaa7a SHA256 55ec3be6b19535a130ab6e9dc783f5fe7a063cdaca7e4184c6d54acaba2d7697
-DIST boost-patches-1.37.0-1.tbz2 1190 RMD160 570fb7fc057188e577a3fa966e35d44f9582016f SHA1 b13eea81da8a20c17451ac70eb2f5b1ba9234d47 SHA256 f7a14a7fbf05340bef1af89e0db763148a785986b49841b5dba561c9b72977e7
+DIST boost-patches-1.37.0-1.tbz2 1207 RMD160 009566c470f15608061cd48b2303ea20c4f907ae SHA1 4344d12f6e0ebcebbc82671d10190e15d36d48b4 SHA256 a10e3de954a812a181835f62b410c53b9ff21b8e7a063850fc70c0cf58804b37
DIST boost_1_35_0.tar.bz2 23416747 RMD160 89dc46b7841cd288b5fb6f4b9a1ac7309786dc14 SHA1 80d1fe7b0c45541e2af7628295b18f2af996de16 SHA256 f8bf7368a22ccf2e2cf77048ab2129744be4c03f8488c76ad31c0aa229b280da
DIST boost_1_36_0.tar.bz2 28839275 RMD160 0ac38ee3c355c22fd5534bc806bf516890e5182d SHA1 b8f0f5d90b260aff995ef38fad4eee5e73d00810 SHA256 9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
DIST boost_1_37_0.tar.bz2 29435646 RMD160 3c4cf7eb97a8fb126e564ba529ed9edec8765185 SHA1 c0d0cf9ad8d954507824aed51a3e93e6a9da1d99 SHA256 d52ef49f70b1b9addc4e0d1a3a2a1966227f0d173c3301bac3e6d399eeac5472
EBUILD boost-1.35.0-r3.ebuild 7262 RMD160 70acd75f2a23c6178cc896aa17aedacd1615324c SHA1 d8477d3e8a25e3f3a14543925afba9f62fed05c6 SHA256 d421c8552c42e2debb20b2b35172680e55a7a6ccbb1bddba4cc37e0928dd5ab2
EBUILD boost-1.36.0.ebuild 7262 RMD160 ea80ea69af085d340118d0b4f747070473dea7d2 SHA1 edd4aa2f0a261f195e3d136844f4449d115b7067 SHA256 1a4fe3224c649dab7b2c4b0b89016425a0288e40c29a73c0e56895c1c146a119
-EBUILD boost-1.37.0.ebuild 7262 RMD160 0ffd19d4f6a4033eea13d59a98b58eb14bee5165 SHA1 8819c3e9a0729cf0bcf1e8d07fc15eb740d1abb3 SHA256 17c70000e56875b47d394945d5dfc82fc6ce5014e988386c2ebda3ee64dbf3ad
+EBUILD boost-1.37.0.ebuild 7359 RMD160 cb6fdcb3ca03f14ed2694883c5b3acefd8bfde2d SHA1 e53f817fa13c5ff2b15df7297af1cbfed5a23530 SHA256 fc9fa083c18eeabda53a6f393d971ea401f6375b330d0aafebf9d8254a7b68f1
diff --git a/dev-libs/boost/boost-1.37.0.ebuild b/dev-libs/boost/boost-1.37.0.ebuild
index b4fd749..c52525c 100644
--- a/dev-libs/boost/boost-1.37.0.ebuild
+++ b/dev-libs/boost/boost-1.37.0.ebuild
@@ -9,7 +9,7 @@ inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
MY_P=${PN}_$(replace_all_version_separators _)
-MAJOR_PV=$(get_version_component_range 1-2)
+MAJOR_PV=$(replace_all_version_separators _ $(get_version_component_range 1-2))
PATCHSET_VERSION="${PV}-1"
DESCRIPTION="Boost Libraries for C++"
@@ -27,7 +27,7 @@ RDEPEND="icu? ( >=dev-libs/icu-3.3 )
virtual/python
!<=dev-libs/boost-1.35.0-r2"
DEPEND="${RDEPEND}
- dev-util/boost-build:${MAJOR_PV}"
+ dev-util/boost-build:$(get_version_component_range 1-2)"
S=${WORKDIR}/${MY_P}
@@ -35,6 +35,8 @@ S=${WORKDIR}/${MY_P}
# ToDo:
# - write a patch to support /dev/urandom on FreeBSD and OSX (see below)
+BJAM="bjam-${MAJOR_PV}"
+
pkg_setup() {
if has test ${FEATURES} ; then
CHECKREQS_DISK_BUILD="1024"
@@ -91,7 +93,7 @@ generate_options() {
OPTIONS="${OPTIONS} --without-mpi"
fi
- OPTIONS="${OPTIONS} --user-config=${S}/user-config.jam --boost-build=/usr/share/boost-build"
+ OPTIONS="${OPTIONS} --user-config=${S}/user-config.jam --boost-build=/usr/share/boost-build-${MAJOR_PV}"
}
src_configure() {
@@ -137,7 +139,7 @@ src_compile() {
export BOOST_ROOT=${S}
- bjam ${NUMJOBS} -q \
+ ${BJAM} ${NUMJOBS} -q \
${OPTIONS} \
threading=single,multi link=shared,static runtime-link=shared,static \
--prefix="${D}/usr" \
@@ -148,7 +150,7 @@ src_compile() {
cd "${S}/tools/"
# We have to set optimization to -O0 or -O1 to work around a gcc-bug
# optimization=off adds -O0 to the compiler call and overwrites our settings.
- bjam ${NUMJOBS} -q \
+ ${BJAM} ${NUMJOBS} -q \
${OPTIONS} \
--prefix="${D}/usr" \
--layout=versioned \
@@ -157,7 +159,7 @@ src_compile() {
if has test ${FEATURES} ; then
cd "${S}/tools/regression/build"
- bjam -q \
+ ${BJAM} -q \
${OPTIONS} \
--prefix="${D}/usr" \
--layout=versioned \
@@ -172,7 +174,7 @@ src_install () {
export BOOST_ROOT=${S}
- bjam -q \
+ ${BJAM} -q \
${OPTIONS} \
threading=single,multi link=shared,static runtime-link=shared,static \
--prefix="${D}/usr" \
@@ -231,7 +233,7 @@ src_install () {
dodoc regress.log
fi
- use python && python_need_rebuild
+ python_need_rebuild
}
src_test() {
@@ -248,7 +250,7 @@ src_test() {
# but adapted to our needs.
# Run the tests & write them into a file for postprocessing
- bjam \
+ ${BJAM} \
${OPTIONS} \
--dump-tests 2>&1 | tee regress.log