diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
commit | f78108598211053d41752a83e0345441bb9014ae (patch) | |
tree | dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /dev-libs/boost | |
parent | dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff) |
gentoo resync : 11.02.2018
Diffstat (limited to 'dev-libs/boost')
-rw-r--r-- | dev-libs/boost/Manifest | 11 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.62.0-r1.ebuild | 444 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.63.0.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.65.0.ebuild | 2 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch | 62 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch | 23 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.48.0-python_linking.patch | 24 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch | 69 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch | 22 |
9 files changed, 656 insertions, 5 deletions
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 7e0ff7f160f1..69ecf805daa5 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1,10 +1,17 @@ AUX boost-1.48.0-disable_icu_rpath.patch 1077 BLAKE2B 367246d711de06ef20a93a0e2a354fff4e8360ef79582a75d262b2e6dfcd76a5c2bb00e719a05ca79c7f5f0f3fefa975713251e65cb9f2c09e76cb6c3b16888b SHA512 013503fd16bcb609c624c9952a5448e612b81150db9ce60b5a51acbb57b62ce1cf0e7c5dd4a58c110ca7895c86effef24d8fe55ea3f316c9e47d5c549a33180c +AUX boost-1.48.0-disable_libboost_python3.patch 1513 BLAKE2B fd0f5d8d3ff67861725e18b10a7191025b5f0cf242dbf38a44896d5b305268d6e585f093077b2e9a6ae9e13b7b94a01e387f7858215fbe78b127f84f6a8d8de7 SHA512 9a2b189530af9fa149203f0621b171461f11212306aeb4d94075a2896ed97abb12d47e6bc0429814405829244604044c2101ad34686a10b12ebe3536b2289ed7 +AUX boost-1.48.0-no_strict_aliasing_python2.patch 745 BLAKE2B 204ab844356219e90c80bcd0824090672ebe90ea95b79c5dd94d2759a1a522d1b6fa487fce1c991439848cf5581a85bfb8eca6a79150b78aa703bba8efc06993 SHA512 ad4c7b8ec59154e2e9588b72a23453f4dc915eecc87a065b10eccc6f713e4a55270f0766bad7766c53dfb934e4d94a25d006567c9e18d0e7dc32649f5a601296 +AUX boost-1.48.0-python_linking.patch 1282 BLAKE2B 06365a2fc9348829d673aa06756adbb0681af062bac8ea1a569f54a20c6680630d4d2cb38d7a152a1ff14d7795fb3373310a6da32c01c6a3f745c110fa5aae4b SHA512 9aff888908476107bde818f306fafd855408d214dd13abd3406339b911ba3c56a7a76ac2a549c63be16ba73a86275860fc1bf78c2fd976c872772b4199ecedb6 +AUX boost-1.51.0-respect_python-buildid.patch 1577 BLAKE2B 0db82775912e88d84bfbf152912db4754e42bf17c954e4b505d3ce796bd3883c589902570f0c6762d073c7827e044e2d3b174329f7f8dd132cf46fadc069a1c8 SHA512 bbe7e586a95c615d51612bf0404c07179b07c33a33e67957af5056ff80f44c620f81244d7fe30519f08f2d19e1d87f8fa09fa32c7f5d37f6f13de4590c050731 +AUX boost-1.51.0-support_dots_in_python-buildid.patch 617 BLAKE2B 1e95323dacd3c351bfa5a7c2d92a358e3068439fba12e01fc8889b4f3d607cd8640f2d2547f2fa1453a04f972022a47a70b11066ff7632a89dd976428085235e SHA512 667452299f96ac3008340f901c6a5355956676b10f82134e650f8c8e06e7c6f8814c2b92d07e958c31b11e013601c0b3ad4020cdc35bbd558761fcd33bb68b3c AUX boost-1.55.0-context-x32.patch 1077 BLAKE2B 76ff0e52ca076ccddd58a469b4531f49782d6373bfa9d65ac63fe365fe90d25d10557fa041584f8d0bcf04438a90e78b69624006220f53983a456485b868cbc9 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73 AUX boost-1.56.0-build-auto_index-tool.patch 412 BLAKE2B 4449dbe600547f339eba9afc4d3da5310f08baa2dd1beb30f9c1b4076e95e867c8fa84fef8a84e2aa38bf35368173e52057e73499a66766cbb81e2d3312fa07b SHA512 9fe245adddf76375d0ee8066952c46d229c9e37fdce83ff608fcc1fb5942b1c226a0fba6e28f859bbcd58863dc49a356f32c7fcc3b90baca4069c6bdc9c0f203 AUX boost-1.63.0-fix-python.patch 4210 BLAKE2B f39a501c9a2718ff77300d97ec8d1ec0a99e90b6f4f2f4ef970a5daaebe1065a870d98f759c0e946707251a93bda0c54f3f864b1e4189f915226d638738e7dca SHA512 0f390cae5a53f48f548e65149aaca4b1191ca6610863e7e471686556107c8ac398eb4bcad71a92849e941cad031cec9cbd543c646ee122238579ca881c420aad AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d06173b6a5b7b4bc1c2fcc64e645eac22e9e4f85c8b278a1fcefcb15e389a38d82ec90facdbb1e7812f9f4cc77d2fe93 SHA512 df2e8841b3415724b2920230da36e3e3aa610a5d7ee7dcada847cb4d6c921405ef4f0c034f96d1ac078d33bb3f32408b748cf7835f173b6e7692c76c6135e2f2 +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 -EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 6fde392860974292dccb109facefae5e06632023b361769815090451d8d216e9028e0466843a87bc24e5e24608f595ffe0841b52e32155f7a7fa2facfe72a494 SHA512 c405a5a6e1ea19e4309227a7c2204b5f0f46ff564644925bfbf02cbd43108422e04b378f24dafcdabdb0154f7f41fb5532594acc61666c8c8aa21a024e04db5c -EBUILD boost-1.65.0.ebuild 12448 BLAKE2B cb38a7d66a524328c469b0362a092ba26fb0c5a434bfd5d6a268e81493d1049e77611423d26a58233d811b5bcdb153f19555b8a8baf9776b073be8ef0c929f0e SHA512 be6d9c9e909661dd3ee28cb9c87ed4aef940b7a643eb938a919e112c3d5a03bf9c5bc425d0c1b7e6ca033395d317754cd5e6eb78bd44eb2e3d3119d41cde53b2 +EBUILD boost-1.62.0-r1.ebuild 12501 BLAKE2B 2eec65f9186d5d411aaa67475810871777bde06316f7c36b44437cfe2e2a68bb7cc867f63745ee3abb4bad3c8db3efa228adbb65035546b3796e19b2d973e859 SHA512 3294c7dfbdd1a414cf910edd38882c57e97b670b844d18cb547887ff1b3d74c7ac09ae74a4a1e5c10d1a8be58cd7b9292e82752342a33f7a5c6c525ac0bac072 +EBUILD boost-1.63.0.ebuild 12465 BLAKE2B e04262f3f3a40a0cdf877c2e5c3b76356bfcd20a0140dc0b8e3e6f0e9978e020a62438e0413972064c56d3813ee2fe040ef6a0a514fc2798e0249ac896a6a956 SHA512 14f708e886a954d83b9e7d5e3a7b3b4dfce6345631fce38b2f18ba4f51468c8ceb692430a6cebf36443979e4880653d72c144b5b240415c4e59f02d82d66dc93 +EBUILD boost-1.65.0.ebuild 12446 BLAKE2B c8c22809a2ba6d496f1d3985f9f102083e4cf196a127900002443a26eb38a9e4cc761f26e7d3d9327435924bbf034a8a5d725549fd127731ed16d7ba5e9aa5e1 SHA512 9db27a7d0f96e7112360d70eaf19f1596b7d80099e2eaf3115f8e082763f087410b80973c7348a60aa0ee93a0989b82252c7923c6f479b5f74c210cde51f00aa MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6 diff --git a/dev-libs/boost/boost-1.62.0-r1.ebuild b/dev-libs/boost/boost-1.62.0-r1.ebuild new file mode 100644 index 000000000000..7ee2ada110df --- /dev/null +++ b/dev-libs/boost/boost-1.62.0-r1.ebuild @@ -0,0 +1,444 @@ +# 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 +} diff --git a/dev-libs/boost/boost-1.63.0.ebuild b/dev-libs/boost/boost-1.63.0.ebuild index 8a8fe19c9edf..391581e396a9 100644 --- a/dev-libs/boost/boost-1.63.0.ebuild +++ b/dev-libs/boost/boost-1.63.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -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 ~x86-solaris ~x86-winnt" +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 ~x86-solaris ~x86-winnt" IUSE="context debug doc icu +nls mpi python static-libs +threads tools" diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild index c19ef1eaa08a..4e488c142135 100644 --- a/dev-libs/boost/boost-1.65.0.ebuild +++ b/dev-libs/boost/boost-1.65.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -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 ~x86-solaris ~x86-winnt" +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 ~x86-solaris ~x86-winnt" IUSE="context debug doc icu +nls mpi python static-libs +threads tools" diff --git a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch new file mode 100644 index 000000000000..d4560400d7d5 --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch @@ -0,0 +1,62 @@ +--- 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 ; +-} diff --git a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch new file mode 100644 index 000000000000..cb26792f99c9 --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch @@ -0,0 +1,23 @@ +--- 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. diff --git a/dev-libs/boost/files/boost-1.48.0-python_linking.patch b/dev-libs/boost/files/boost-1.48.0-python_linking.patch new file mode 100644 index 000000000000..330cbb11e885 --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-python_linking.patch @@ -0,0 +1,24 @@ +--- 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 diff --git a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch new file mode 100644 index 000000000000..17a681611b6f --- /dev/null +++ b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch @@ -0,0 +1,69 @@ +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 ] ; diff --git a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch new file mode 100644 index 000000000000..a8912eb5e048 --- /dev/null +++ b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch @@ -0,0 +1,22 @@ +--- 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) [*\\/:\"\'] _ ] ; + } + + |