summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/boost/boost-1.37.0.ebuild')
-rw-r--r--dev-libs/boost/boost-1.37.0.ebuild20
1 files changed, 11 insertions, 9 deletions
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