From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 23B83138A1A for ; Tue, 17 Feb 2015 04:04:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 377E3E09B7; Tue, 17 Feb 2015 04:03:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B81E6E09B7 for ; Tue, 17 Feb 2015 04:03:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C4B7340830 for ; Tue, 17 Feb 2015 04:03:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05E5F11ED5 for ; Tue, 17 Feb 2015 04:03:56 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1424145782.25058eb90fbb2a6c5eb23de9ce8386682fd14005.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-libs/boost/, dev-libs/boost/files/ X-VCS-Repository: proj/sci X-VCS-Files: dev-libs/boost/ChangeLog dev-libs/boost/boost-1.56.0-r2.ebuild dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch dev-libs/boost/files/boost-1.48.0-python_linking.patch dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch dev-libs/boost/files/boost-1.52.0-threads.patch dev-libs/boost/files/boost-1.55.0-context-x32.patch dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch dev-libs/boost/metadata.xml X-VCS-Directories: dev-libs/boost/files/ dev-libs/boost/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 25058eb90fbb2a6c5eb23de9ce8386682fd14005 X-VCS-Branch: master Date: Tue, 17 Feb 2015 04:03:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b131d523-8f7d-4fe8-9ba0-6764cd54f0c1 X-Archives-Hash: bf949cfee1bfb62b111acfce808f85c2 commit: 25058eb90fbb2a6c5eb23de9ce8386682fd14005 Author: Christoph Junghans gentoo org> AuthorDate: Tue Feb 17 04:03:02 2015 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Tue Feb 17 04:03:02 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=25058eb9 added full multilib version Package-Manager: portage-2.2.14 --- dev-libs/boost/ChangeLog | 17 + dev-libs/boost/boost-1.56.0-r2.ebuild | 398 +++++++++++++++++++++ .../files/boost-1.48.0-disable_icu_rpath.patch | 29 ++ .../boost-1.48.0-disable_libboost_python3.patch | 62 ++++ .../boost-1.48.0-no_strict_aliasing_python2.patch | 23 ++ .../boost/files/boost-1.48.0-python_linking.patch | 24 ++ .../boost-1.51.0-respect_python-buildid.patch | 69 ++++ ...ost-1.51.0-support_dots_in_python-buildid.patch | 22 ++ dev-libs/boost/files/boost-1.52.0-threads.patch | 63 ++++ .../boost/files/boost-1.55.0-context-x32.patch | 42 +++ .../files/boost-1.55.0-tools-c98-compat.patch | 17 + .../files/boost-1.56.0-build-auto_index-tool.patch | 13 + dev-libs/boost/metadata.xml | 38 ++ 13 files changed, 817 insertions(+) diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog new file mode 100644 index 0000000..893df76 --- /dev/null +++ b/dev-libs/boost/ChangeLog @@ -0,0 +1,17 @@ +# ChangeLog for dev-libs/boost +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*boost-1.56.0-r2 (17 Feb 2015) + + 17 Feb 2015; Christoph Junghans +boost-1.56.0-r2.ebuild, + +files/boost-1.48.0-disable_icu_rpath.patch, + +files/boost-1.48.0-disable_libboost_python3.patch, + +files/boost-1.48.0-no_strict_aliasing_python2.patch, + +files/boost-1.48.0-python_linking.patch, + +files/boost-1.51.0-respect_python-buildid.patch, + +files/boost-1.51.0-support_dots_in_python-buildid.patch, + +files/boost-1.52.0-threads.patch, +files/boost-1.55.0-context-x32.patch, + +files/boost-1.55.0-tools-c98-compat.patch, + +files/boost-1.56.0-build-auto_index-tool.patch, +metadata.xml: + added full multilib version diff --git a/dev-libs/boost/boost-1.56.0-r2.ebuild b/dev-libs/boost/boost-1.56.0-r2.ebuild new file mode 100644 index 0000000..e035399 --- /dev/null +++ b/dev-libs/boost/boost-1.56.0-r2.ebuild @@ -0,0 +1,398 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.3 2015/01/05 17:58:25 ottxor Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) + +inherit eutils flag-o-matic multilib 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="mirror://sourceforge/boost/${MY_P}.tar.bz2" + +LICENSE="Boost-1.0" +SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 +KEYWORDS="~alpha ~amd64 ~arm ~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" + +RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] ) + 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" + +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 + if tc-is-cross-compiler; then + python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;" + else + python_configuration="using python : : ${PYTHON} ;" + fi + fi + + cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ +using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${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() { + epatch \ + "${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.55.0-tools-c98-compat.patch" \ + "${FILESDIR}/${PN}-1.52.0-threads.patch" \ + "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch" + + # 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 + + epatch_user + + 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 + + # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. + append-cxxflags -std=gnu++98 + + 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" + + OPTIONS+=" pch=off" + OPTIONS+=" --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\"" + OPTIONS+=" --layout=system" + OPTIONS+=" threading=$(usex threads multi single) 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 || die + fi + + if use doc; then + find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf + dohtml \ + -A pdf,txt,cpp,hpp \ + *.{htm,html,png,css} \ + -r doc + dohtml -A pdf,txt -r tools + insinto /usr/share/doc/${PF}/html + doins -r libs + doins -r more + + # To avoid broken links + insinto /usr/share/doc/${PF}/html + doins 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 + [[ -L ${symlink} ]] && rm -f "${symlink}" + done +} diff --git a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch new file mode 100644 index 0000000..a902d61 --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch @@ -0,0 +1,29 @@ +--- libs/locale/build/Jamfile.v2 ++++ libs/locale/build/Jamfile.v2 +@@ -58,8 +58,8 @@ + + if $(ICU_LINK) + { +- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin shared ; +- ICU64_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin64 shared ; ++ ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) shared ; ++ ICU64_OPTS = $(ICU_PATH)/include $(ICU_LINK) shared ; + } + else + { +@@ -117,7 +117,6 @@ + icuuc/shared/shared + icudt/shared/shared + icuin/shared/shared +- $(ICU_PATH)/bin + shared ; + + +@@ -176,7 +175,6 @@ + icuuc_64/shared/shared + icudt_64/shared/shared + icuin_64/shared/shared +- $(ICU_PATH)/bin64 + shared ; + + 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 0000000..c24a56c --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch @@ -0,0 +1,62 @@ +--- libs/python/build/Jamfile.v2 ++++ 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 @@ + config-warning + + on:BOOST_DEBUG_PYTHON +- [ cond $(is-py3) : $(py3-version) ] + : # default build + 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 0000000..89f8109 --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch @@ -0,0 +1,23 @@ +--- libs/python/build/Jamfile.v2 ++++ 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 + static:BOOST_PYTHON_STATIC_LIB + BOOST_PYTHON_SOURCE ++ [ cond $(python2) : -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 0000000..e7f4e7c --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-python_linking.patch @@ -0,0 +1,24 @@ +--- libs/python/build/Jamfile.v2 ++++ libs/python/build/Jamfile.v2 +@@ -109,20 +109,7 @@ + static:BOOST_PYTHON_STATIC_LIB + BOOST_PYTHON_SOURCE + [ cond $(python2) : -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 ] : /python//python_for_extensions ] ++ [ cond [ python.configured ] : /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 0000000..327429e --- /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 + +--- boostcpp.jam ++++ 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) [*\\/:.\"\'] _ ] ; +-} +- + + ################################################################################ + # +--- libs/mpi/build/Jamfile.v2 ++++ 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 @@ + @$(__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) ; +--- libs/python/build/Jamfile.v2 ++++ 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 0000000..c8dc6e1 --- /dev/null +++ b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch @@ -0,0 +1,22 @@ +--- libs/mpi/build/Jamfile.v2 ++++ 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 ) +--- libs/python/build/Jamfile.v2 ++++ 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) [*\\/:\"\'] _ ] ; + } + + diff --git a/dev-libs/boost/files/boost-1.52.0-threads.patch b/dev-libs/boost/files/boost-1.52.0-threads.patch new file mode 100644 index 0000000..e078fc2 --- /dev/null +++ b/dev-libs/boost/files/boost-1.52.0-threads.patch @@ -0,0 +1,63 @@ +Index: /trunk/boostcpp.jam +=================================================================== +--- /trunk/boostcpp.jam (revision 79301) ++++ /trunk/boostcpp.jam (revision 81000) +@@ -210,6 +210,44 @@ + } + ++rule filtered-target ( name : message + : sources + : requirements * ) ++{ ++ message $(name)-message : warning: $(message) ; ++ alias $(name) : $(sources) : $(requirements) ; ++ alias $(name) : $(name)-message ; ++ ++ local p = [ project.current ] ; ++ $(p).mark-target-as-explicit $(name) ; ++ $(p).mark-target-as-explicit $(name)-message ; ++} ++ + rule declare_install_and_stage_proper_targets ( libraries * : headers * ) + { ++ for local l in $(libraries) ++ { ++ if $(l) = locale ++ { ++ filtered-target $(l)-for-install : ++ Skipping Boost.Locale library with threading=single. : ++ libs/$(l)/build : multi ; ++ } ++ else if $(l) = wave ++ { ++ filtered-target $(l)-for-install : ++ Skipping Boost.Wave library with threading=single. : ++ libs/$(l)/build : multi ; ++ } ++ else if $(l) = thread ++ { ++ filtered-target $(l)-for-install : ++ Skipping Boost.Thread library with threading=single. : ++ libs/$(l)/build : multi ; ++ } ++ else ++ { ++ alias $(l)-for-install : libs/$(l)/build ; ++ } ++ } ++ local library-targets = $(libraries)-for-install ; ++ + install-requirements = $(BOOST_ROOT)/boost ; + +@@ -239,5 +277,5 @@ + : $(install-requirements) on + : +- : libs/$(libraries)/build ++ : $(libraries)-for-install + : $(headers) + ; +@@ -246,5 +284,5 @@ + # Install just library. + install stage-proper +- : libs/$(libraries)/build ++ : $(libraries)-for-install + : $(stage-locate)/lib + on LIB diff --git a/dev-libs/boost/files/boost-1.55.0-context-x32.patch b/dev-libs/boost/files/boost-1.55.0-context-x32.patch new file mode 100644 index 0000000..5bf7406 --- /dev/null +++ b/dev-libs/boost/files/boost-1.55.0-context-x32.patch @@ -0,0 +1,42 @@ +https://svn.boost.org/trac/boost/ticket/9445 + +hack to fix x32 builds + +--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S ++++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S +@@ -31,6 +31,10 @@ + * * + * *****************************************************************/ + ++#ifdef __x86_64__ ++#include "jump_x86_64_sysv_elf_gas.S" ++#else ++ + .text + .globl jump_fcontext + .align 2 +@@ -73,3 +77,5 @@ jump_fcontext: + + /* Mark that we don't need executable stack. */ + .section .note.GNU-stack,"",%progbits ++ ++#endif +--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S ++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S +@@ -31,6 +31,10 @@ + * * + * *****************************************************************/ + ++#ifdef __x86_64__ ++#include "make_x86_64_sysv_elf_gas.S" ++#else ++ + .text + .globl make_fcontext + .align 2 +@@ -78,3 +82,5 @@ finish: + + /* Mark that we don't need executable stack. */ + .section .note.GNU-stack,"",%progbits ++ ++#endif diff --git a/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch b/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch new file mode 100644 index 0000000..df2a14a --- /dev/null +++ b/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch @@ -0,0 +1,17 @@ +Make tools compiled successfully with forced C++98 + +Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=503468 + +diff --git a/tools/regression/src/compiler_status.cpp b/tools/regression/src/compiler_status.cpp +index 63f8134..3f3374a 100644 +--- a/tools/regression/src/compiler_status.cpp ++++ b/tools/regression/src/compiler_status.cpp +@@ -128,7 +128,7 @@ namespace + string ln(line); + if (ln.find("Revision: ") != string::npos) + { +- for(auto itr = ln.begin()+10; itr != ln.end() && isdigit(*itr); ++itr) ++ for(string::iterator itr = ln.begin()+10; itr != ln.end() && isdigit(*itr); ++itr) + rev += *itr; + } + } diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch new file mode 100644 index 0000000..5175800 --- /dev/null +++ b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch @@ -0,0 +1,13 @@ +Build auto_index tool with USE="tools" +Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066 + +--- tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300 ++++ tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300 +@@ -20,6 +20,7 @@ + use-project /boost/regression : regression/build ; + + TOOLS = ++ auto_index/build//auto_index + bcp//bcp + inspect/build//inspect + quickbook//quickbook diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml new file mode 100644 index 0000000..03f221b --- /dev/null +++ b/dev-libs/boost/metadata.xml @@ -0,0 +1,38 @@ + + + + cpp + + + Build and install the Boost.Context library and all other + Boostlibraries that depends on it + + + Build and install the boost tools (bcp, quickbook, inspect, + wave) + + + Build and install debug versions of the Boost libraries. These + libraries are not used by default, and should not be used unless + you're developing against Boost. + + + Build and install only the debug version of the Boost + libraries. Only enable this flag if you're developing against + boost. + + + Build multi-thread-compatible libraries instead of + single-threaded only. + + + Build libboost_locale. This library requires compatible C + library interfaces, which might not be provided by uClibc or + other embedded libraries. + + + Install the full API documentation documentation. This takes + over 200MB of extra disk space. + + +