diff options
author | 2015-05-27 10:39:24 -0700 | |
---|---|---|
committer | 2015-05-27 10:39:24 -0700 | |
commit | 1c8eabceb40766de5cc18c4b2e68927c42075640 (patch) | |
tree | 32473e1b19877fc5dce150ecfa5cf331e1c0d443 | |
parent | firefox fixups (diff) | |
download | arm-1c8eabceb40766de5cc18c4b2e68927c42075640.tar.gz arm-1c8eabceb40766de5cc18c4b2e68927c42075640.tar.bz2 arm-1c8eabceb40766de5cc18c4b2e68927c42075640.zip |
moved boost updates to portage-overlay
-rw-r--r-- | dev-libs/boost/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.58.0.ebuild | 405 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.52.0-threads.patch | 63 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch | 13 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.58.0-fix-exec_file-for-python-3-3.4.patch | 31 | ||||
-rw-r--r-- | dev-util/boost-build/Manifest | 1 | ||||
-rw-r--r-- | dev-util/boost-build/boost-build-1.58.0.ebuild | 139 | ||||
-rw-r--r-- | dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch | 13 |
8 files changed, 0 insertions, 666 deletions
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest deleted file mode 100644 index 1f86f9c..0000000 --- a/dev-libs/boost/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST boost_1_58_0.tar.bz2 70394057 SHA256 fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5 SHA512 7480ec713b0aa13f0ec990603e87e3b5c8d53f4411329b10fae37fc963b90aad12dbd9290a33c3669ae801e9012a68683eadff057591e9ca2ebcd22b1a67b5d1 WHIRLPOOL 0ed66f7de8b2ac28eda89e2fcadfc5533e6a3887ef7a929610804efa3ca66b850fecafeb61c986d37cb704ec844744e47d08f87e08ea25c779f57cffd26a1be2 diff --git a/dev-libs/boost/boost-1.58.0.ebuild b/dev-libs/boost/boost-1.58.0.ebuild deleted file mode 100644 index 8c6c1bc..0000000 --- a/dev-libs/boost/boost-1.58.0.ebuild +++ /dev/null @@ -1,405 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,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 ~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" - -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[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" - -EPATCH_OPTS="-F 3" - -python_bindings_needed() { - multilib_is_native_abi && use python -} - -tools_needed() { - multilib_is_native_abi && use tools -} - -# MPI stuff is not ported on multilib yet, disabling it for non-native ABIs -mpi_needed() { - multilib_is_native_abi && use mpi -} - -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 mpi_needed; 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>"${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() { - 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.52.0-threads.patch" \ - "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch" \ - "${FILESDIR}"/${P}-fix-exec_file-for-python-3-3.4.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" - mpi_needed || 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 mpi_needed; 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 mpi_needed; 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 mpi_needed; 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.52.0-threads.patch b/dev-libs/boost/files/boost-1.52.0-threads.patch deleted file mode 100644 index e078fc2..0000000 --- a/dev-libs/boost/files/boost-1.52.0-threads.patch +++ /dev/null @@ -1,63 +0,0 @@ -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 : <threading>multi ;
-+ }
-+ else if $(l) = wave
-+ {
-+ filtered-target $(l)-for-install :
-+ Skipping Boost.Wave library with threading=single. :
-+ libs/$(l)/build : <threading>multi ;
-+ }
-+ else if $(l) = thread
-+ {
-+ filtered-target $(l)-for-install :
-+ Skipping Boost.Thread library with threading=single. :
-+ libs/$(l)/build : <threading>multi ;
-+ }
-+ else
-+ {
-+ alias $(l)-for-install : libs/$(l)/build ;
-+ }
-+ }
-+ local library-targets = $(libraries)-for-install ;
-+
- install-requirements = <install-source-root>$(BOOST_ROOT)/boost ;
-
-@@ -239,5 +277,5 @@
- : $(install-requirements) <install-no-version-symlinks>on
- :
-- : libs/$(libraries)/build
-+ : $(libraries)-for-install
- : $(headers)
- ;
-@@ -246,5 +284,5 @@
- # Install just library.
- install stage-proper
-- : libs/$(libraries)/build
-+ : $(libraries)-for-install
- : <location>$(stage-locate)/lib
- <install-dependencies>on <install-type>LIB
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 deleted file mode 100644 index 5175800..0000000 --- a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/files/boost-1.58.0-fix-exec_file-for-python-3-3.4.patch b/dev-libs/boost/files/boost-1.58.0-fix-exec_file-for-python-3-3.4.patch deleted file mode 100644 index cd10a25..0000000 --- a/dev-libs/boost/files/boost-1.58.0-fix-exec_file-for-python-3-3.4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3e405b6fd5db5615bbef241763de070118222ca7 Mon Sep 17 00:00:00 2001 -From: Stefan Seefeld <stefan@seefeld.name> -Date: Thu, 9 Apr 2015 08:57:08 -0400 -Subject: [PATCH] Fix exec_file for Python 3 < 3.4. - ---- - src/exec.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/exec.cpp b/src/exec.cpp -index 2910db7..12cdabc 100644 ---- a/libs/python/src/exec.cpp -+++ b/libs/python/src/exec.cpp -@@ -86,9 +86,12 @@ object BOOST_PYTHON_DECL exec_file(str filename, object global, object local) - char *f = python::extract<char *>(filename); - - // Let python open the file to avoid potential binary incompatibilities. --#if PY_VERSION_HEX >= 0x03000000 -- // See http://www.codeproject.com/Articles/820116/Embedding-Python-program-in-a-C-Cplusplus-code -+#if PY_VERSION_HEX >= 0x03400000 - FILE *fs = _Py_fopen(f, "r"); -+#elif PY_VERSION_HEX >= 0x03000000 -+ PyObject *fo = Py_BuildValue("s", f); -+ FILE *fs = _Py_fopen(fo, "r"); -+ Py_DECREF(fo); - #else - PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r")); - if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file"); --- -2.3.5 - diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest deleted file mode 100644 index 1f86f9c..0000000 --- a/dev-util/boost-build/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST boost_1_58_0.tar.bz2 70394057 SHA256 fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5 SHA512 7480ec713b0aa13f0ec990603e87e3b5c8d53f4411329b10fae37fc963b90aad12dbd9290a33c3669ae801e9012a68683eadff057591e9ca2ebcd22b1a67b5d1 WHIRLPOOL 0ed66f7de8b2ac28eda89e2fcadfc5533e6a3887ef7a929610804efa3ca66b850fecafeb61c986d37cb704ec844744e47d08f87e08ea25c779f57cffd26a1be2 diff --git a/dev-util/boost-build/boost-build-1.58.0.ebuild b/dev-util/boost-build/boost-build-1.58.0.ebuild deleted file mode 100644 index 3f22c4b..0000000 --- a/dev-util/boost-build/boost-build-1.58.0.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -RESTRICT="test" - -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator - -MY_PV="$(replace_all_version_separators _)" - -DESCRIPTION="A system for large project software construction, which is simple to use and powerful" -HOMEPAGE="http://www.boost.org/doc/tools/build/index.html" -SRC_URI="mirror://sourceforge/boost/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 ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~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" - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi -} - -src_unpack() { - tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed" -} - -src_prepare() { - epatch \ - "${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" - - pushd ../ &>/dev/null || die - epatch "${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" - - epatch_user -} - -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|2.7 2.6 2.5 2.4 2.3 2.2|${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 - - rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed" - if ! use python; then - find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed" - fi - - dodoc ../notes/{changes,hacking,release_procedure,build_dir_option,relative_source_paths}.txt - - if use examples; then - dodoc -r ../example - docompress -x "/usr/share/doc/${PF}/example" - 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.55.0-ppc-aix.patch b/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch deleted file mode 100644 index a521309..0000000 --- a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/10122 - ---- engine/mem.h -+++ 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. */ |