mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-libs/boost: Drop 1.62.0 for real
Package-Manager: Portage-2.3.24, Repoman-2.3.6
This commit is contained in:
Andreas Sturmlechner
@@ -1,3 +1,2 @@
|
||||
DIST boost_1_62_0.tar.bz2 84513338 BLAKE2B 00f2ddf93d254183709a5e607d5cec5d135bdcddebac15fc3b1522e37b9e58d8df84f1977fee5b085309db58634861f2014e72822e755dd7789e8489fef19f7c SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be
|
||||
DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
|
||||
DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
|
||||
|
||||
@@ -1,444 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
|
||||
|
||||
inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
|
||||
|
||||
MY_P="${PN}_$(replace_all_version_separators _)"
|
||||
MAJOR_V="$(get_version_component_range 1-2)"
|
||||
|
||||
DESCRIPTION="Boost Libraries for C++"
|
||||
HOMEPAGE="http://www.boost.org/"
|
||||
SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="Boost-1.0"
|
||||
SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
|
||||
KEYWORDS="hppa"
|
||||
|
||||
IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
|
||||
|
||||
RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
|
||||
!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
|
||||
mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
app-arch/bzip2[${MULTILIB_USEDEP}]
|
||||
sys-libs/zlib[${MULTILIB_USEDEP}]
|
||||
!app-admin/eselect-boost"
|
||||
DEPEND="${RDEPEND}
|
||||
=dev-util/boost-build-${MAJOR_V}*"
|
||||
REQUIRED_USE="
|
||||
mpi? ( threads )
|
||||
python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
# the tests will never fail because these are not intended as sanity
|
||||
# tests at all. They are more a way for upstream to check their own code
|
||||
# on new compilers. Since they would either be completely unreliable
|
||||
# (failing for no good reason) or completely useless (never failing)
|
||||
# there is no point in having them in the ebuild to begin with.
|
||||
RESTRICT="test"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch"
|
||||
"${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch"
|
||||
"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch"
|
||||
"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch"
|
||||
"${FILESDIR}/${PN}-1.48.0-python_linking.patch"
|
||||
"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
|
||||
"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
|
||||
"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
|
||||
)
|
||||
|
||||
python_bindings_needed() {
|
||||
multilib_is_native_abi && use python
|
||||
}
|
||||
|
||||
tools_needed() {
|
||||
multilib_is_native_abi && use tools
|
||||
}
|
||||
|
||||
create_user-config.jam() {
|
||||
local compiler compiler_version compiler_executable
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
compiler="darwin"
|
||||
compiler_version="$(gcc-fullversion)"
|
||||
compiler_executable="$(tc-getCXX)"
|
||||
else
|
||||
compiler="gcc"
|
||||
compiler_version="$(gcc-version)"
|
||||
compiler_executable="$(tc-getCXX)"
|
||||
fi
|
||||
local mpi_configuration python_configuration
|
||||
|
||||
if use mpi; then
|
||||
mpi_configuration="using mpi ;"
|
||||
fi
|
||||
|
||||
if python_bindings_needed; then
|
||||
# boost expects libpython$(pyver) and doesn't allow overrides
|
||||
# and the build system is so creepy that it's easier just to
|
||||
# provide a symlink (linker's going to use SONAME anyway)
|
||||
# TODO: replace it with proper override one day
|
||||
ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
|
||||
else
|
||||
# note: we need to provide version explicitly because of
|
||||
# a bug in the build system:
|
||||
# https://github.com/boostorg/build/pull/104
|
||||
python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
|
||||
fi
|
||||
fi
|
||||
|
||||
cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
|
||||
using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
|
||||
${mpi_configuration}
|
||||
${python_configuration}
|
||||
__EOF__
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# Bail out on unsupported build configuration, bug #456792
|
||||
if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
|
||||
grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
|
||||
(
|
||||
eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
|
||||
eerror "Boost can not be built in such configuration."
|
||||
eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
|
||||
die
|
||||
)
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Do not try to build missing 'wave' tool, bug #522682
|
||||
# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
|
||||
sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
|
||||
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
ejam() {
|
||||
local b2_opts=(
|
||||
"--user-config=${BOOST_ROOT}/user-config.jam"
|
||||
"$@"
|
||||
)
|
||||
echo b2 "${b2_opts[@]}"
|
||||
b2 "${b2_opts[@]}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Workaround for too many parallel processes requested, bug #506064
|
||||
[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
|
||||
|
||||
OPTIONS=(
|
||||
$(usex debug gentoodebug gentoorelease)
|
||||
"-j$(makeopts_jobs)"
|
||||
-q
|
||||
-d+2
|
||||
)
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
# We need to add the prefix, and in two cases this exceeds, so prepare
|
||||
# for the largest possible space allocation.
|
||||
append-ldflags -Wl,-headerpad_max_install_names
|
||||
elif [[ ${CHOST} == *-winnt* ]]; then
|
||||
compiler=parity
|
||||
if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
|
||||
compilerVersion=trunk
|
||||
else
|
||||
compilerVersion=$($(tc-getCXX) -v | sed '1q' \
|
||||
| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
|
||||
fi
|
||||
compilerExecutable=$(tc-getCXX)
|
||||
fi
|
||||
|
||||
# bug 298489
|
||||
if use ppc || use ppc64; then
|
||||
[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
|
||||
fi
|
||||
|
||||
# Use C++14 globally as of 1.62
|
||||
append-cxxflags -std=c++14
|
||||
|
||||
use icu && OPTIONS+=(
|
||||
"-sICU_PATH=${EPREFIX}/usr"
|
||||
)
|
||||
use icu || OPTIONS+=(
|
||||
--disable-icu
|
||||
boost.locale.icu=off
|
||||
)
|
||||
use mpi || OPTIONS+=(
|
||||
--without-mpi
|
||||
)
|
||||
use nls || OPTIONS+=(
|
||||
--without-locale
|
||||
)
|
||||
use context || OPTIONS+=(
|
||||
--without-context
|
||||
--without-coroutine
|
||||
--without-coroutine2
|
||||
--without-fiber
|
||||
)
|
||||
use threads || OPTIONS+=(
|
||||
--without-thread
|
||||
)
|
||||
|
||||
OPTIONS+=(
|
||||
pch=off
|
||||
--boost-build="${EPREFIX}"/usr/share/boost-build
|
||||
--prefix="${ED%/}/usr"
|
||||
--layout=system
|
||||
# building with threading=single is currently not possible
|
||||
# https://svn.boost.org/trac/boost/ticket/7105
|
||||
threading=multi
|
||||
link=$(usex static-libs shared,static shared)
|
||||
)
|
||||
|
||||
[[ ${CHOST} == *-winnt* ]] && OPTIONS+=(
|
||||
-sNO_BZIP2=1
|
||||
)
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
local -x BOOST_ROOT="${BUILD_DIR}"
|
||||
PYTHON_DIRS=""
|
||||
MPI_PYTHON_MODULE=""
|
||||
|
||||
building() {
|
||||
create_user-config.jam
|
||||
|
||||
local PYTHON_OPTIONS
|
||||
if python_bindings_needed; then
|
||||
PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
|
||||
else
|
||||
PYTHON_OPTIONS=" --without-python"
|
||||
fi
|
||||
|
||||
ejam \
|
||||
"${OPTIONS[@]}" \
|
||||
${PYTHON_OPTIONS} \
|
||||
|| die "Building of Boost libraries failed"
|
||||
|
||||
if python_bindings_needed; then
|
||||
if [[ -z "${PYTHON_DIRS}" ]]; then
|
||||
PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
|
||||
else
|
||||
if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
|
||||
die "Inconsistent structure of build directories"
|
||||
fi
|
||||
fi
|
||||
|
||||
local dir
|
||||
for dir in ${PYTHON_DIRS}; do
|
||||
mv ${dir} ${dir}-${EPYTHON} \
|
||||
|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
|
||||
done
|
||||
|
||||
if use mpi; then
|
||||
if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
|
||||
MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
|
||||
if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
|
||||
die "Multiple mpi.so files found"
|
||||
fi
|
||||
else
|
||||
if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
|
||||
die "Inconsistent structure of build directories"
|
||||
fi
|
||||
fi
|
||||
|
||||
mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
|
||||
|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
if python_bindings_needed; then
|
||||
python_foreach_impl building
|
||||
else
|
||||
building
|
||||
fi
|
||||
|
||||
if tools_needed; then
|
||||
pushd tools >/dev/null || die
|
||||
|
||||
ejam \
|
||||
"${OPTIONS[@]}" \
|
||||
${PYTHON_OPTIONS} \
|
||||
|| die "Building of Boost tools failed"
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
if ! use python; then
|
||||
rm -r "${ED%/}"/usr/include/boost/python* || die
|
||||
fi
|
||||
|
||||
if ! use nls; then
|
||||
rm -r "${ED%/}"/usr/include/boost/locale || die
|
||||
fi
|
||||
|
||||
if ! use context; then
|
||||
rm -r "${ED%/}"/usr/include/boost/context || die
|
||||
rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
|
||||
rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
|
||||
fi
|
||||
|
||||
if use doc; then
|
||||
# find extraneous files that shouldn't be installed
|
||||
# as part of the documentation and remove them.
|
||||
find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
|
||||
find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
|
||||
find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
|
||||
|
||||
docinto html
|
||||
dodoc *.{htm,html,png,css}
|
||||
dodoc -r doc libs more tools
|
||||
|
||||
# To avoid broken links
|
||||
dodoc LICENSE_1_0.txt
|
||||
|
||||
dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
local -x BOOST_ROOT="${BUILD_DIR}"
|
||||
installation() {
|
||||
create_user-config.jam
|
||||
|
||||
local PYTHON_OPTIONS
|
||||
if python_bindings_needed; then
|
||||
local dir
|
||||
for dir in ${PYTHON_DIRS}; do
|
||||
cp -pr ${dir}-${EPYTHON} ${dir} \
|
||||
|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
|
||||
done
|
||||
|
||||
if use mpi; then
|
||||
cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
|
||||
|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
|
||||
cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
|
||||
|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
|
||||
fi
|
||||
PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
|
||||
else
|
||||
PYTHON_OPTIONS=" --without-python"
|
||||
fi
|
||||
|
||||
ejam \
|
||||
"${OPTIONS[@]}" \
|
||||
${PYTHON_OPTIONS} \
|
||||
--includedir="${ED%/}/usr/include" \
|
||||
--libdir="${ED%/}/usr/$(get_libdir)" \
|
||||
install || die "Installation of Boost libraries failed"
|
||||
|
||||
if python_bindings_needed; then
|
||||
rm -r ${PYTHON_DIRS} || die
|
||||
|
||||
# Move mpi.so Python module to Python site-packages directory.
|
||||
# https://svn.boost.org/trac/boost/ticket/2838
|
||||
if use mpi; then
|
||||
local moddir=$(python_get_sitedir)/boost
|
||||
# moddir already includes eprefix
|
||||
mkdir -p "${D}${moddir}" || die
|
||||
mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
|
||||
cat << EOF > "${D}${moddir}/__init__.py" || die
|
||||
import sys
|
||||
if sys.platform.startswith('linux'):
|
||||
import DLFCN
|
||||
flags = sys.getdlopenflags()
|
||||
sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
|
||||
from . import mpi
|
||||
sys.setdlopenflags(flags)
|
||||
del DLFCN, flags
|
||||
else:
|
||||
from . import mpi
|
||||
del sys
|
||||
EOF
|
||||
fi
|
||||
|
||||
python_optimize
|
||||
fi
|
||||
}
|
||||
if python_bindings_needed; then
|
||||
python_foreach_impl installation
|
||||
else
|
||||
installation
|
||||
fi
|
||||
|
||||
pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
|
||||
|
||||
local ext=$(get_libname)
|
||||
if use threads; then
|
||||
local f
|
||||
for f in *${ext}; do
|
||||
dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
|
||||
done
|
||||
fi
|
||||
|
||||
popd >/dev/null || die
|
||||
|
||||
if tools_needed; then
|
||||
dobin dist/bin/*
|
||||
|
||||
insinto /usr/share
|
||||
doins -r dist/share/boostbook
|
||||
fi
|
||||
|
||||
# boost's build system truely sucks for not having a destdir. Because for
|
||||
# this reason we are forced to build with a prefix that includes the
|
||||
# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
|
||||
# DESTROOT instread of the actual EPREFIX. There is no way out of here
|
||||
# but to do it the dirty way of manually setting the right install_names.
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
einfo "Working around completely broken build-system(tm)"
|
||||
local d
|
||||
for d in "${ED%/}"/usr/lib/*.dylib; do
|
||||
if [[ -f ${d} ]]; then
|
||||
# fix the "soname"
|
||||
ebegin " correcting install_name of ${d#${ED}}"
|
||||
install_name_tool -id "/${d#${D}}" "${d}"
|
||||
eend $?
|
||||
# fix references to other libs
|
||||
refs=$(otool -XL "${d}" | \
|
||||
sed -e '1d' -e 's/^\t//' | \
|
||||
grep "^libboost_" | \
|
||||
cut -f1 -d' ')
|
||||
local r
|
||||
for r in ${refs}; do
|
||||
ebegin " correcting reference to ${r}"
|
||||
install_name_tool -change \
|
||||
"${r}" \
|
||||
"${EPREFIX}/usr/lib/${r}" \
|
||||
"${d}"
|
||||
eend $?
|
||||
done
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Yai for having symlinks that are nigh-impossible to remove without
|
||||
# resorting to dirty hacks like these. Removes lingering symlinks
|
||||
# from the slotted versions.
|
||||
local symlink
|
||||
for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
|
||||
if [[ -L ${symlink} ]]; then
|
||||
rm -f "${symlink}" || die
|
||||
fi
|
||||
done
|
||||
|
||||
# some ancient installs still have boost cruft lying around
|
||||
# for unknown reasons, causing havoc for reverse dependencies
|
||||
# Bug: 607734
|
||||
rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
--- a/libs/python/build/Jamfile.v2
|
||||
+++ b/libs/python/build/Jamfile.v2
|
||||
@@ -39,23 +39,6 @@
|
||||
PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
|
||||
}
|
||||
|
||||
-
|
||||
-rule find-py3-version
|
||||
-{
|
||||
- local versions = [ feature.values python ] ;
|
||||
- local py3ver ;
|
||||
- for local v in $(versions)
|
||||
- {
|
||||
- if $(v) >= 3.0
|
||||
- {
|
||||
- py3ver = $(v) ;
|
||||
- }
|
||||
- }
|
||||
- return $(py3ver) ;
|
||||
-}
|
||||
-
|
||||
-py3-version = [ find-py3-version ] ;
|
||||
-
|
||||
project boost/python
|
||||
: source-location ../src
|
||||
: requirements
|
||||
@@ -82,7 +65,7 @@
|
||||
rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
|
||||
rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
|
||||
|
||||
-rule lib_boost_python ( is-py3 ? )
|
||||
+rule lib_boost_python
|
||||
{
|
||||
|
||||
local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
|
||||
@@ -91,7 +74,7 @@
|
||||
{
|
||||
python2 = true ;
|
||||
}
|
||||
- lib [ cond $(is-py3) : boost_python3 : boost_python ]
|
||||
+ lib boost_python
|
||||
: # sources
|
||||
numeric.cpp
|
||||
list.cpp
|
||||
@@ -148,7 +131,6 @@
|
||||
<dependency>config-warning
|
||||
|
||||
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
|
||||
- [ cond $(is-py3) : <python>$(py3-version) ]
|
||||
: # default build
|
||||
<link>shared
|
||||
: # usage requirements
|
||||
@@ -160,9 +142,3 @@
|
||||
|
||||
lib_boost_python ;
|
||||
boost-install boost_python ;
|
||||
-
|
||||
-if $(py3-version)
|
||||
-{
|
||||
- lib_boost_python yes ;
|
||||
- boost-install boost_python3 ;
|
||||
-}
|
||||
@@ -1,23 +0,0 @@
|
||||
--- a/libs/python/build/Jamfile.v2
|
||||
+++ b/libs/python/build/Jamfile.v2
|
||||
@@ -85,6 +85,12 @@
|
||||
rule lib_boost_python ( is-py3 ? )
|
||||
{
|
||||
|
||||
+ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
|
||||
+ local python2 ;
|
||||
+ if $(python_major_version) = 2
|
||||
+ {
|
||||
+ python2 = true ;
|
||||
+ }
|
||||
lib [ cond $(is-py3) : boost_python3 : boost_python ]
|
||||
: # sources
|
||||
numeric.cpp
|
||||
@@ -119,6 +125,7 @@
|
||||
: # requirements
|
||||
<link>static:<define>BOOST_PYTHON_STATIC_LIB
|
||||
<define>BOOST_PYTHON_SOURCE
|
||||
+ [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
|
||||
|
||||
# On Windows, all code using Python has to link to the Python
|
||||
# import library.
|
||||
@@ -1,24 +0,0 @@
|
||||
--- a/libs/python/build/Jamfile.v2
|
||||
+++ b/libs/python/build/Jamfile.v2
|
||||
@@ -109,20 +109,7 @@
|
||||
<link>static:<define>BOOST_PYTHON_STATIC_LIB
|
||||
<define>BOOST_PYTHON_SOURCE
|
||||
[ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
|
||||
-
|
||||
- # On Windows, all code using Python has to link to the Python
|
||||
- # import library.
|
||||
- #
|
||||
- # On *nix we never link libboost_python to libpython. When
|
||||
- # extending Python, all Python symbols are provided by the
|
||||
- # Python interpreter executable. When embedding Python, the
|
||||
- # client executable is expected to explicitly link to
|
||||
- # /python//python (the target representing libpython) itself.
|
||||
- #
|
||||
- # python_for_extensions is a target defined by Boost.Build to
|
||||
- # provide the Python include paths, and on Windows, the Python
|
||||
- # import library, as usage requirements.
|
||||
- [ cond [ python.configured ] : <library>/python//python_for_extensions ]
|
||||
+ [ cond [ python.configured ] : <library>/python//python ]
|
||||
|
||||
# we prevent building when there is no python available
|
||||
# as it's not possible anyway, and to cause dependents to
|
||||
@@ -1,69 +0,0 @@
|
||||
https://svn.boost.org/trac/boost/ticket/6286
|
||||
|
||||
--- a/boostcpp.jam
|
||||
+++ b/boostcpp.jam
|
||||
@@ -99,13 +99,6 @@
|
||||
BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ;
|
||||
}
|
||||
|
||||
-# Python build id (for Python libraries only).
|
||||
-python-id = [ option.get "python-buildid" ] ;
|
||||
-if $(python-id)
|
||||
-{
|
||||
- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
|
||||
-}
|
||||
-
|
||||
|
||||
################################################################################
|
||||
#
|
||||
--- a/libs/mpi/build/Jamfile.v2
|
||||
+++ b/libs/mpi/build/Jamfile.v2
|
||||
@@ -8,6 +8,8 @@
|
||||
# Authors: Douglas Gregor
|
||||
# Andrew Lumsdaine
|
||||
|
||||
+import option ;
|
||||
+import regex ;
|
||||
import mpi ;
|
||||
import indirect ;
|
||||
import python ;
|
||||
@@ -24,6 +26,13 @@
|
||||
<tag>@$(__name__).tag
|
||||
;
|
||||
|
||||
+# Python build id (for Python libraries only).
|
||||
+python-id = [ option.get "python-buildid" ] ;
|
||||
+if $(python-id)
|
||||
+{
|
||||
+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
|
||||
+}
|
||||
+
|
||||
rule tag ( name : type ? : property-set )
|
||||
{
|
||||
local result = $(name) ;
|
||||
--- a/libs/python/build/Jamfile.v2
|
||||
+++ b/libs/python/build/Jamfile.v2
|
||||
@@ -2,6 +2,8 @@
|
||||
# Software License, Version 1.0. (See accompanying
|
||||
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
+import option ;
|
||||
+import regex ;
|
||||
import os ;
|
||||
import indirect ;
|
||||
import modules ;
|
||||
@@ -30,6 +32,14 @@
|
||||
;
|
||||
}
|
||||
|
||||
+# Python build id (for Python libraries only).
|
||||
+python-id = [ option.get "python-buildid" ] ;
|
||||
+if $(python-id)
|
||||
+{
|
||||
+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
|
||||
+}
|
||||
+
|
||||
+
|
||||
rule find-py3-version
|
||||
{
|
||||
local versions = [ feature.values python ] ;
|
||||
@@ -1,22 +0,0 @@
|
||||
--- a/libs/mpi/build/Jamfile.v2
|
||||
+++ b/libs/mpi/build/Jamfile.v2
|
||||
@@ -30,7 +30,7 @@
|
||||
python-id = [ option.get "python-buildid" ] ;
|
||||
if $(python-id)
|
||||
{
|
||||
- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
|
||||
+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
|
||||
}
|
||||
|
||||
rule tag ( name : type ? : property-set )
|
||||
--- a/libs/python/build/Jamfile.v2
|
||||
+++ b/libs/python/build/Jamfile.v2
|
||||
@@ -36,7 +36,7 @@
|
||||
python-id = [ option.get "python-buildid" ] ;
|
||||
if $(python-id)
|
||||
{
|
||||
- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
|
||||
+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user