dev-util/boost-build: import from portage-stable

This commit is contained in:
David Michael 2017-05-04 14:54:00 -07:00
parent 970ee13014
commit ccf87998ec
11 changed files with 312 additions and 0 deletions

View File

@ -0,0 +1 @@
DIST boost_1_62_0.tar.bz2 84513338 SHA256 36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0 SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be WHIRLPOOL 49c4558d5e6d72084f083a76217e3d97b504f112d7e4d228eded72dc49fa7e675ba943a9fc52a3c27d296ee689aee27d4566796c6eae71cf647430285777c0fb

View File

@ -0,0 +1,139 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
RESTRICT="test"
PYTHON_COMPAT=( python2_7 )
inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
MY_PV="$(replace_all_version_separators _)"
DESCRIPTION="A system for large project software construction, simple to use and powerful"
HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
LICENSE="Boost-1.0"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples python test"
RDEPEND="python? ( ${PYTHON_DEPS} )
!<dev-libs/boost-1.34.0
!<=dev-util/boost-build-1.35.0-r1"
DEPEND="${RDEPEND}
test? ( sys-apps/diffutils
${PYTHON_DEPS} )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
test? ( ${PYTHON_REQUIRED_USE} )"
S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
PATCHES=(
"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
)
pkg_setup() {
if use python || use test; then
python-single-r1_pkg_setup
fi
}
src_unpack() {
tar xjf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
}
src_prepare() {
default
pushd ../ >/dev/null || die
eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
popd >/dev/null || die
# Remove stripping option
# Fix python components build on multilib systems, bug #496446
cd "${S}/engine" || die
sed -i \
-e 's|-s\b||' \
-e "/libpython/s/lib ]/$(get_libdir) ]/" \
build.jam || die "sed failed"
# Force regeneration
rm jambase.c || die
# This patch allows us to fully control optimization
# and stripping flags when bjam is used as build-system
# We simply extend the optimization and debug-symbols feature
# with empty dummies called 'none'
cd "${S}" || die
sed -i \
-e 's/\(off speed space\)/\1 none/' \
-e 's/\(debug-symbols : on off\)/\1 none/' \
tools/builtin.jam || die "sed failed"
}
src_configure() {
if use python; then
# replace versions by user-selected one (TODO: fix this when slot-op
# deps are available to always match the best version available)
sed -i \
-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
engine/build.jam || die "sed failed"
fi
}
src_compile() {
cd engine || die
local toolset
if [[ ${CHOST} == *-darwin* ]]; then
toolset=darwin
else
# Using boost's generic toolset here, which respects CC and CFLAGS
toolset=cc
fi
CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
}
src_install() {
dobin engine/bin.*/{bjam,b2}
insinto /usr/share/boost-build
doins -r "${FILESDIR}/site-config.jam" \
../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
build kernel options tools util
rm "${ED%/}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
if ! use python; then
find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
fi
dodoc ../notes/{changes,hacking,release_procedure,build_dir_option,relative_source_paths}.txt
if use examples; then
dodoc -r ../example
docompress -x "/usr/share/doc/${PF}/example"
fi
}
src_test() {
cd ../test || die
export TMP="${T}"
DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
if [[ -s test_results.txt ]]; then
eerror "At least one test failed: $(<test_results.txt)"
die "tests failed"
fi
}

View File

@ -0,0 +1,11 @@
--- a/tools/python.jam
+++ b/tools/python.jam
@@ -961,7 +961,7 @@
# linux).
: $(usage-requirements)
<testing.launcher>$(set-PYTHONPATH)
- <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib
+ <library-path>$(libraries) <library>python.lib
;
}

View File

@ -0,0 +1,26 @@
Avoid adding all kinds of things to the toolchain's flags that within
Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target,
arch, etc.
--- a/tools/darwin.jam
+++ b/tools/darwin.jam
@@ -227,6 +227,9 @@
}
}
+ # leave compiler flags etc. up to the toolchain
+ return $(version-feature) ;
+
if $(version-feature)
{
if $(.debug-configuration)
@@ -387,7 +390,8 @@
support-ppc64 = ;
}
}
- switch $(arch)
+ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either
+ switch $(donotaddarchpleaseXXXarch)
{
case combined :
{

View File

@ -0,0 +1,53 @@
--- a/engine/build.jam
+++ b/engine/build.jam
@@ -3,7 +3,7 @@
#~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
# Clean env vars of any "extra" empty values.
-for local v in ARGV CC CFLAGS LIBS
+for local v in ARGV CC CFLAGS LDFLAGS LIBS
{
local values ;
for local x in $($(v))
@@ -179,10 +179,10 @@
if ! $(CC) { CC = cc ; }
toolset cc $(CC) : "-o " : -D
: $(CFLAGS)
- [ opt --release : -s -O ]
+ [ opt --release : ]
[ opt --debug : -g ]
-I$(--python-include) -I$(--extra-include)
- : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+ : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
## Comeau C/C++ 4.x
toolset como como : "-o " : -D
: --c
@@ -201,11 +201,11 @@
## MacOSX Darwin, using GCC 2.9.x, 3.x
toolset darwin cc : "-o " : -D
:
- [ opt --release : -Wl,-x -O3 -finline-functions ]
+ [ opt --release : -Wl,-x -finline-functions ]
[ opt --debug : -g -O0 -fno-inline -pg ]
[ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ]
-I$(--python-include) -I$(--extra-include)
- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+ : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
## GCC 2.x, 3.x, 4.x
toolset gcc gcc : "-o " : -D
: -pedantic -fno-strict-aliasing
--- a/engine/build.sh
+++ b/engine/build.sh
@@ -224,9 +224,9 @@
cc)
if test -z "$CC" ; then CC=cc ; fi
BOOST_JAM_CC=$CC
- BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
- BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
- BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS"
+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS"
+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS"
;;
qcc)

View File

@ -0,0 +1,17 @@
Don't look for the framework path, we build Python the UNIX way for
Gentoo Prefix
--- a/engine/build.jam
+++ b/engine/build.jam
@@ -82,11 +82,6 @@
}
--python-lib = $(--python-lib[1]) ;
}
- else if $(OS) = MACOSX
- {
- --python-include = [ .path $(python-location) Headers ] ;
- --python-lib = $(python-location) Python ;
- }
else
{
--python-include = ;

View File

@ -0,0 +1,11 @@
--- a/test/startup_v2.py
+++ b/test/startup_v2.py
@@ -50,7 +50,7 @@
return re.match(expected, actual, re.DOTALL) != None
-t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0)
+t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0)
t.set_tree("startup")
check_for_existing_boost_build_jam(t)

View File

@ -0,0 +1,19 @@
--- a/tools/common.jam
+++ b/tools/common.jam
@@ -763,7 +763,15 @@
switch $(f:G)
{
case <base> :
- result += $(name:B) ;
+ local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
+ if $(matched) = boost_python || $(matched) = boost_mpi_python
+ {
+ result += $(name) ;
+ }
+ else
+ {
+ result += $(name:B) ;
+ }
case <toolset> :
result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :

View File

@ -0,0 +1,13 @@
https://svn.boost.org/trac/boost/ticket/10122
--- a/engine/mem.h
+++ b/engine/mem.h
@@ -8,6 +8,8 @@
#ifndef BJAM_MEM_H
#define BJAM_MEM_H
+#include "jam.h"
+
#ifdef OPT_BOEHM_GC
/* Use Boehm GC memory allocator. */

View File

@ -0,0 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
# Define two new variants to be used when building boost (or separate boost-libs)
# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols
# values "none" which are not part of the official boost distribution.
# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS!
variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;
variant gentoodebug : debug : <optimization>none <debug-symbols>on <runtime-link>shared ;

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cpp@gentoo.org</email>
<name>Gentoo C++ Project</name>
</maintainer>
<upstream>
<remote-id type="sourceforge">boost</remote-id>
</upstream>
</pkgmetadata>