diff options
author | Patrick McLean <chutzpah@gentoo.org> | 2018-03-06 11:12:46 -0800 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2018-03-06 11:32:41 -0800 |
commit | 2e6883dc8ad13bd074b3346b7381e983ab7e190c (patch) | |
tree | 7c0f8aa62e58f7fa16d8a529000d11ee301431f6 /dev-util | |
parent | package.mask: Fixed nx mask. (diff) | |
download | gentoo-2e6883dc8ad13bd074b3346b7381e983ab7e190c.tar.gz gentoo-2e6883dc8ad13bd074b3346b7381e983ab7e190c.tar.bz2 gentoo-2e6883dc8ad13bd074b3346b7381e983ab7e190c.zip |
dev-util/boost-build: Unkeyworded version bump to 1.66 (bug 630754)
Unkeyworded pending testing and review from boost project team.
Bug: https://bugs.gentoo.org/630754
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/boost-build/Manifest | 1 | ||||
-rw-r--r-- | dev-util/boost-build/boost-build-1.66.0.ebuild | 140 | ||||
-rw-r--r-- | dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch | 26 |
3 files changed, 167 insertions, 0 deletions
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest index 89aea0140746..634ff7f4e4ba 100644 --- a/dev-util/boost-build/Manifest +++ b/dev-util/boost-build/Manifest @@ -1,3 +1,4 @@ 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 +DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b diff --git a/dev-util/boost-build/boost-build-1.66.0.ebuild b/dev-util/boost-build/boost-build-1.66.0.ebuild new file mode 100644 index 000000000000..6fb626d7b0e3 --- /dev/null +++ b/dev-util/boost-build/boost-build-1.66.0.ebuild @@ -0,0 +1,140 @@ +# 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.35.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" + "${FILESDIR}/${PN}-1.66.0-add-none-feature-options.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 + + 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 +} diff --git a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch b/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch new file mode 100644 index 000000000000..fd86c9e2fc71 --- /dev/null +++ b/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch @@ -0,0 +1,26 @@ +diff --git a/tools/features/debug-feature.jam b/tools/features/debug-feature.jam +index 04958f9a..38b6acf1 100644 +--- a/tools/features/debug-feature.jam ++++ b/tools/features/debug-feature.jam +@@ -8,7 +8,7 @@ + import feature ; + + feature.feature debug-symbols +- : on off ++ : on off none + : propagated ; + + feature.feature profiling +diff --git a/tools/features/optimization-feature.jam b/tools/features/optimization-feature.jam +index 761f76f1..fb2a5dec 100644 +--- a/tools/features/optimization-feature.jam ++++ b/tools/features/optimization-feature.jam +@@ -8,7 +8,7 @@ + import feature ; + + feature.feature optimization +- : off speed space ++ : off none speed space + : propagated ; + + feature.feature inlining |