mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-16 06:41:38 +01:00
dev-util/boost-build: Move back to portage-stable
This commit is contained in:
parent
b651d349b7
commit
d0791d4a12
@ -1 +0,0 @@
|
|||||||
DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
|
|
||||||
@ -1,140 +0,0 @@
|
|||||||
# Copyright 1999-2018 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 ~x64-cygwin ~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 xojf "${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
|
|
||||||
|
|
||||||
tc-is-cross-compiler && sed -i -e 's/BOOST_JAM_CC=\$CC$/BOOST_JAM_CC=cc/' build.sh
|
|
||||||
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
|
|
||||||
|
|
||||||
if ! use python; then
|
|
||||||
find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
|
|
||||||
|
|
||||||
if use examples; then
|
|
||||||
docinto examples
|
|
||||||
dodoc -r ../example/.
|
|
||||||
docompress -x /usr/share/doc/${PF}/examples
|
|
||||||
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
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- 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
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
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 :
|
|
||||||
{
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
--- 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)
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
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 = ;
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- 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)
|
|
||||||
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
--- 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) :
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
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. */
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
# 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 ;
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<?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>
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install prepare setup test unpack
|
|
||||||
DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
|
|
||||||
DESCRIPTION=A system for large project software construction, simple to use and powerful
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
|
|
||||||
IUSE=examples python test python_targets_python2_7
|
|
||||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
|
||||||
LICENSE=Boost-1.0
|
|
||||||
RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1
|
|
||||||
REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2_7 )
|
|
||||||
RESTRICT=test
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
|
|
||||||
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
|
|
||||||
_md5_=e19d139c1d5486892cca4c5038867133
|
|
||||||
Loading…
x
Reference in New Issue
Block a user