diff options
author | hwoarang <hwoarang@gentoo.org> | 2011-03-14 19:43:01 +0200 |
---|---|---|
committer | hwoarang <hwoarang@gentoo.org> | 2011-03-14 19:43:01 +0200 |
commit | 710e1c5c3f8ab7308422c203a6a4a0c7396ee43d (patch) | |
tree | c6d0f29a7a0f95dce5894f5321c928d14cd87d2c | |
parent | Add patch from bug #249232. Thanks to Victoria Heisner (diff) | |
download | hwoarang-710e1c5c3f8ab7308422c203a6a4a0c7396ee43d.tar.gz hwoarang-710e1c5c3f8ab7308422c203a6a4a0c7396ee43d.tar.bz2 hwoarang-710e1c5c3f8ab7308422c203a6a4a0c7396ee43d.zip |
Initial commit for boost-* 1.46.1 stuff
25 files changed, 1061 insertions, 4 deletions
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest new file mode 100644 index 0000000..60441a5 --- /dev/null +++ b/dev-libs/boost/Manifest @@ -0,0 +1,12 @@ +AUX 1.35-remove-hardlink-creation.patch 547 RMD160 0c0bae87977869efcd2e25144b910025ab3e6924 SHA1 c3833411ab8e7c84efddc5cfb4ab99abcba1eed5 SHA256 9b0515f343f0c8f7f0ce51e2c6f243edae0f3d5ce5df5b9f77a46b00041a134e +AUX boost-1.42.0-gcc45-python.patch 628 RMD160 261b0e98f133fd745e29998bd0f0165f0a007ab3 SHA1 80146b1018e96b0958d930e2a8c828310ffec68a SHA256 5ab528cfc9beb940d6cfa94ff1b39b0e29c6adc3c1d1906f31cfabaf94232761 +AUX boost-1.42.0-parameter-needs-python.patch 3037 RMD160 901d7bdda6c9f604d5487b09d247592e8558fcfa SHA1 ee3bf830495506e6d250b2073efbf42de60f9d03 SHA256 0d0e47ef2582da43c40ccf8b5b58435a2d42e2236d29ea7883e1b1ecd1aaa439 +AUX boost-1.42.0-template_arity-gcc45.patch 970 RMD160 0edcdbcaf0165e4e285b041f6406b1f71e798753 SHA1 f0cccc3ba7c2496f092cbc623473d21585bdd304 SHA256 e289a56bed08914704fad58bc4779ce9f327b4acac8ebd6a93bc6dd09f9a6e98 +AUX boost-1.45.0-lambda_bind.patch 1607 RMD160 ea61aaac83cfebfcb10c0e20de72022d4d4c1b27 SHA1 39856bef27d2a55f1ae2e0d7a7005264a8613289 SHA256 0ff6a7bf481d5311ec57be1eeaafdd0c0e9e0c09b896700d40295f67bf77be0b +AUX buildid-fix.patch 1045 RMD160 ce9dbea25e21ed1ac177b16982ef1850957474f2 SHA1 af1069055e6f8d8fa143fb2ddeccb2fc36ddce9a SHA256 42a2aa4c0f4d8579a501d6133f55852acbd1d7b497598983c50bdebaa17df17f +AUX random-Jamfile 355 RMD160 478b592e9d33d371b07e5364e63512c8208263bf SHA1 8ca047df78758f62a6c131bd27441173e9079fa6 SHA256 7dc71ab8b862ccd5ea9c21c42557adfe0c711ea7fbe7faa47328a37aa84bc096 +AUX random-Jamfile-1.45.0 358 RMD160 dd8a847d5104923006795c9a19fa9154e49a8894 SHA1 a3d8cc42b95a09a451c2a1c429e019288f3b76aa SHA256 412c26f915db9d2664305d596406f6a75132d8cfe1827b42f17dc083dc632f00 +AUX remove-toolset-1.45.0.patch 465 RMD160 18b160e97e183392a635ebc60f840d10c30a0b1b SHA1 e476d9b06e7e16499ee7659f5178a52564d6831a SHA256 c1cc35cd5e25160e481912dcdd1e45a86d518bb0ac009ad50bd3811b097226b7 +AUX remove_toolset_from_targetname.patch 490 RMD160 e050992fd79005af73410a2ea4037a82177ddf33 SHA1 80d96cca8cb0acb752c428ffcada3ef2964642b1 SHA256 5c5c6fea3c1e20e290d15a68f91b6c084cc5b34daae338e3aa0879a3fd5b9fb5 +DIST boost_1_46_1.tar.bz2 42001335 RMD160 bb43b39f7c4b683b80bafa3042b95e65a242d9c3 SHA1 3ca6e173ec805e5126868d8a03618e587aa26aef SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d04469cbeee05e43ea19236416d883 +EBUILD boost-1.46.1.ebuild 15764 RMD160 7e10ecdd1a2189b282c8cb8cf274956b7eeb5362 SHA1 9d4f8db32dc7008c6172dec279b87fa1029d6e0a SHA256 496470b2c41cddbbf0c22435cad8be859c82b08c801c47472f9c70b96454e91f diff --git a/dev-libs/boost/boost-1.46.1.ebuild b/dev-libs/boost/boost-1.46.1.ebuild new file mode 100644 index 0000000..7555494 --- /dev/null +++ b/dev-libs/boost/boost-1.46.1.ebuild @@ -0,0 +1,485 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.45.0.ebuild,v 1.5 2011/01/21 12:04:30 hwoarang Exp $ + +EAPI="2" + +inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs + +MY_P=${PN}_$(replace_all_version_separators _) + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="http://www.boost.org/" +SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2" +LICENSE="Boost-1.0" +SLOT="$(get_version_component_range 1-2)" +IUSE="debug doc +eselect icu mpi python static-libs test tools" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +RDEPEND="icu? ( >=dev-libs/icu-3.3 ) + mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) + sys-libs/zlib + python? ( virtual/python ) + !!<=dev-libs/boost-1.35.0-r2 + >=app-admin/eselect-boost-0.3" +DEPEND="${RDEPEND} + dev-util/boost-build:${SLOT}" + +S=${WORKDIR}/${MY_P} + +MAJOR_PV=$(replace_all_version_separators _ ${SLOT}) +BJAM="bjam-${MAJOR_PV}" + +# Usage: +# _add_line <line-to-add> <profile> +# ... to add to specific profile +# or +# _add_line <line-to-add> +# ... to add to all profiles for which the use flag set + +_add_line() { + if [ -z "$2" ] ; then + echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" + use debug && echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" + else + echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}" + fi +} + +pkg_setup() { + # It doesn't compile with USE="python mpi" and python-3 (bug 295705) + if use python && use mpi ; then + if [[ "$(python_get_version --major)" != "2" ]]; then + eerror "The Boost.MPI python bindings do not support any other python version" + eerror "than 2.x. Please either use eselect to select a python 2.x version or" + eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}." + die "unsupported python version" + fi + fi + + if use test ; then + CHECKREQS_DISK_BUILD="15360" + check_reqs + + ewarn "The tests may take several hours on a recent machine" + ewarn "but they will not fail (unless something weird happens ;-)" + ewarn "This is because the tests depend on the used compiler/-version" + ewarn "and the platform and upstream says that this is normal." + ewarn "If you are interested in the results, please take a look at the" + ewarn "generated results page:" + ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html" + ebeep 5 + + fi + + if use debug ; then + ewarn "The debug USE-flag means that a second set of the boost libraries" + ewarn "will be built containing debug-symbols. You'll be able to select them" + ewarn "using the boost-eselect module. But even though the optimization flags" + ewarn "you might have set are not stripped, there will be a performance" + ewarn "penalty and linking other packages against the debug version" + ewarn "of boost is _not_ recommended." + fi +} + +src_prepare() { + epatch "${FILESDIR}/remove-toolset-1.45.0.patch" + + # This enables building the boost.random library with /dev/urandom support + if [[ -e /dev/urandom ]] ; then + mkdir -p libs/random/build + cp "${FILESDIR}/random-Jamfile-1.45.0" libs/random/build/Jamfile.v2 + fi +} + +src_configure() { + einfo "Writing new user-config.jam" + + local compiler compilerVersion compilerExecutable mpi + if [[ ${CHOST} == *-darwin* ]] ; then + compiler=darwin + compilerVersion=$(gcc-fullversion) + compilerExecutable=$(tc-getCXX) + # 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 + else + compiler=gcc + compilerVersion=$(gcc-version) + compilerExecutable=$(tc-getCXX) + fi + + # Using -fno-strict-aliasing to prevent possible creation of invalid code. + append-flags -fno-strict-aliasing + + # bug 298489 + if use ppc || use ppc64 ; then + [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec + fi; + + use mpi && mpi="using mpi ;" + + if use python ; then + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;" + fi + + cat > "${S}/user-config.jam" << __EOF__ + +variant gentoorelease : release : <optimization>none <debug-symbols>none ; +variant gentoodebug : debug : <optimization>none ; + +using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; + +${pystring} + +${mpi} + +__EOF__ + + # Maintainer information: + # The debug-symbols=none and optimization=none + # are not official upstream flags but a Gentoo + # specific patch to make sure that all our + # CXXFLAGS/LDFLAGS are being respected. + # Using optimization=off would for example add + # "-O0" and override "-O2" set by the user. + # Please take a look at the boost-build ebuild + # for more infomration. + + use icu && OPTIONS="-sICU_PATH=/usr" + use mpi || OPTIONS="${OPTIONS} --without-mpi" + use python || OPTIONS="${OPTIONS} --without-python" + + # https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch + if use sparc || use mips || use hppa || use arm || use x86-fbsd || use sh; then + OPTIONS="${OPTIONS} --disable-long-double" + fi + + OPTIONS="${OPTIONS} pch=off --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned" + + if use static-libs ; then + LINK_OPTS="link=shared,static" + LIBRARY_TARGETS="*.a *$(get_libname)" + else + LINK_OPTS="link=shared" + #there is no dynamicly linked version of libboost_test_exec_monitor + LIBRARY_TARGETS="libboost_test_exec_monitor*.a *$(get_libname)" + fi +} + +src_compile() { + jobs=$( echo " ${MAKEOPTS} " | \ + sed -e 's/ --jobs[= ]/ -j /g' \ + -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ + -e 's/ -j\>/ -j1/g' | \ + ( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) ) + if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; + + export BOOST_ROOT="${S}" + + einfo "Using the following command to build: " + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared" + + ${BJAM} ${NUMJOBS} -q -d+2 \ + gentoorelease \ + ${OPTIONS} \ + threading=single,multi ${LINK_OPTS} runtime-link=shared \ + || die "building boost failed" + + # ... and do the whole thing one more time to get the debug libs + if use debug ; then + einfo "Using the following command to build: " + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug" + + ${BJAM} ${NUMJOBS} -q -d+2 \ + gentoodebug \ + ${OPTIONS} \ + threading=single,multi ${LINK_OPTS} runtime-link=shared \ + --buildid=debug \ + || die "building boost failed" + fi + + if use tools; then + cd "${S}/tools/" + einfo "Using the following command to build the tools: " + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS}" + + ${BJAM} ${NUMJOBS} -q -d+2\ + gentoorelease \ + ${OPTIONS} \ + || die "building tools failed" + fi + +} + +src_install () { + export BOOST_ROOT="${S}" + + einfo "Using the following command to install: " + einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install" + + ${BJAM} -q -d+2 \ + gentoorelease \ + ${OPTIONS} \ + threading=single,multi ${LINK_OPTS} runtime-link=shared \ + --includedir="${D}/usr/include" \ + --libdir="${D}/usr/$(get_libdir)" \ + install || die "install failed for options '${OPTIONS}'" + + if use debug ; then + einfo "Using the following command to install: " + einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug" + + ${BJAM} -q -d+2 \ + gentoodebug \ + ${OPTIONS} \ + threading=single,multi ${LINK_OPTS} runtime-link=shared \ + --includedir="${D}/usr/include" \ + --libdir="${D}/usr/$(get_libdir)" \ + --buildid=debug \ + install || die "install failed for options '${OPTIONS}'" + fi + + use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python* || die + + dodir /usr/share/boost-eselect/profiles/${SLOT} || die + touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" || die + if use debug ; then + touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" || die + fi + + # Move the mpi.so to the right place and make sure it's slotted + if use mpi && use python; then + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" || die + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\"" + 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 || die + dohtml \ + -A pdf,txt \ + -r tools || die + insinto /usr/share/doc/${PF}/html + doins -r libs || die + + # To avoid broken links + insinto /usr/share/doc/${PF}/html + doins LICENSE_1_0.txt || die + + dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost || die + fi + + cd "${D}/usr/$(get_libdir)" || die + + # Remove (unversioned) symlinks + # And check for what we remove to catch bugs + # got a better idea how to do it? tell me! + for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}") ; do + if [ ! -h "${f}" ] ; then + eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink" + die "slotting/naming of the libs broken!" + fi + rm "${f}" || die + done + + # The threading libs obviously always gets the "-mt" (multithreading) tag + # some packages seem to have a problem with it. Creating symlinks... + + if use static-libs ; then + THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)" + else + THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)" + fi + for lib in ${THREAD_LIBS} ; do + dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die + done + + # The same goes for the mpi libs + if use mpi ; then + if use static-libs ; then + MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)" + else + MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)" + fi + for lib in ${MPI_LIBS} ; do + dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die + done + fi + + if use debug ; then + if use static-libs ; then + THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a" + else + THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)" + fi + + for lib in ${THREAD_DEBUG_LIBS} ; do + dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die + done + + if use mpi ; then + if use static-libs ; then + MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)" + else + MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)" + fi + + for lib in ${MPI_DEBUG_LIBS} ; do + dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die + done + fi + fi + + # Create a subdirectory with completely unversioned symlinks + # and store the names in the profiles-file for eselect + dodir /usr/$(get_libdir)/boost-${MAJOR_PV} || die + + _add_line "libs=\"" default + for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug) ; do + dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}} || die + _add_line "/usr/$(get_libdir)/${f}" default + done + _add_line "\"" default + + if use debug ; then + _add_line "libs=\"" debug + dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug || die + for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug) ; do + dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug} || die + _add_line "/usr/$(get_libdir)/${f}" debug + done + _add_line "\"" debug + + _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug + _add_line "suffix=\"-debug\"" debug + fi + + _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default + + if use tools; then + cd "${S}/dist/bin" || die + # Append version postfix to binaries for slotting + _add_line "bins=\"" + for b in * ; do + newbin "${b}" "${b}-${MAJOR_PV}" || die + _add_line "/usr/bin/${b}-${MAJOR_PV}" + done + _add_line "\"" + + cd "${S}/dist" || die + insinto /usr/share || die + doins -r share/boostbook || die + # Append version postfix for slotting + mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}" || die + _add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\"" + fi + + cd "${S}/status" || die + if [ -f regress.log ] ; then + docinto status || die + dohtml *.html ../boost.png || die + dodoc regress.log || die + fi + + use python && python_need_rebuild + + # 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. + [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/ + if [[ ${CHOST} == *-darwin* ]] ; then + einfo "Working around completely broken build-system(tm)" + 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' ') + 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 +} + +src_test() { + export BOOST_ROOT=${S} + + cd "${S}/tools/regression/build" || die + einfo "Using the following command to build test helpers: " + einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} process_jam_log compiler_status" + + ${BJAM} -q -d+2 \ + gentoorelease \ + ${OPTIONS} \ + process_jam_log compiler_status \ + || die "building regression test helpers failed" + + cd "${S}/status" || die + + # Some of the test-checks seem to rely on regexps + export LC_ALL="C" + + # The following is largely taken from tools/regression/run_tests.sh, + # but adapted to our needs. + + # Run the tests & write them into a file for postprocessing + einfo "Using the following command to test: " + einfo "${BJAM} ${OPTIONS} --dump-tests" + + ${BJAM} \ + ${OPTIONS} \ + --dump-tests 2>&1 | tee regress.log || die + + # Postprocessing + cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/process_jam_log" --v2 + if test $? != 0 ; then + die "Postprocessing the build log failed" + fi + + cat > "${S}/status/comment.html" <<- __EOF__ + <p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p> +__EOF__ + + # Generate the build log html summary page + "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/compiler_status" --v2 \ + --comment "${S}/status/comment.html" "${S}" \ + cs-$(uname).html cs-$(uname)-links.html + if test $? != 0 ; then + die "Generating the build log html summary page failed" + fi + + # And do some cosmetic fixes :) + sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die +} + +pkg_postinst() { + if use eselect ; then + eselect boost update || ewarn "eselect boost update failed." + fi + + if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then + elog "No active boost version found. Calling eselect to select one..." + eselect boost update || ewarn "eselect boost update failed." + fi +} diff --git a/dev-libs/boost/files/1.35-remove-hardlink-creation.patch b/dev-libs/boost/files/1.35-remove-hardlink-creation.patch new file mode 100644 index 0000000..4b1c143 --- /dev/null +++ b/dev-libs/boost/files/1.35-remove-hardlink-creation.patch @@ -0,0 +1,21 @@ +--- Jamroot.orig 2009-04-03 19:23:02.876426258 +0200 ++++ Jamroot 2009-04-03 19:37:05.899697787 +0200 +@@ -444,14 +444,10 @@ + } + return $(result) ; + } +- +- generate stage-unversioned : stage-proper : +- <generating-rule>@make-unversioned-links ; +- explicit stage-unversioned ; +- +- generate install-unversioned : install-proper : +- <generating-rule>@make-unversioned-links ; +- explicit install-unversioned ; ++ ++ ++ alias stage-unversioned ; ++ alias install-unversioned ; + } + else + { diff --git a/dev-libs/boost/files/CVS/Entries b/dev-libs/boost/files/CVS/Entries new file mode 100644 index 0000000..99aca3e --- /dev/null +++ b/dev-libs/boost/files/CVS/Entries @@ -0,0 +1,19 @@ +/1.35-remove-hardlink-creation.patch/1.1/Tue Apr 7 09:43:13 2009// +/boost-1.37.0-darwin-long-double.patch/1.1/Thu May 28 17:42:50 2009// +/boost-1.41.0-fix-CRC-on-x64-during-gzip-decompression.patch/1.1/Thu Dec 17 13:21:09 2009// +/boost-1.41.0-iostreams-missing-include-guard.patch/1.1/Tue Dec 8 14:48:52 2009// +/boost-1.41.0-mpi_process_group-missing-include.patch/1.1/Wed Dec 2 14:32:19 2009// +/boost-1.41.0-parameter-needs-python.patch/1.1/Wed Dec 2 14:32:19 2009// +/boost-1.41.0-spirit-fixed-include-guard-conflict.patch/1.1/Mon Dec 21 10:13:41 2009// +/boost-1.42.0-gcc45-python.patch/1.1/Sat Aug 14 07:43:30 2010// +/boost-1.42.0-parameter-needs-python.patch/1.1/Wed Mar 3 13:02:00 2010// +/boost-1.42.0-template_arity-gcc45.patch/1.1/Sun May 30 06:51:42 2010// +/boost-1.45.0-lambda_bind.patch/1.1/Fri Jan 21 11:54:27 2011// +/buildid-fix.patch/1.1/Tue Apr 7 09:43:13 2009// +/random-Jamfile/1.1/Mon Dec 18 23:17:00 2006// +/random-Jamfile-1.45.0/1.1/Mon Jan 10 17:40:58 2011// +/remove-toolset-1.41.0.patch/1.1/Wed Dec 2 14:32:19 2009// +/remove-toolset-1.42.0.patch/1.1/Wed Mar 3 13:02:00 2010// +/remove-toolset-1.45.0.patch/1.1/Thu Jan 6 14:11:22 2011// +/remove_toolset_from_targetname.patch/1.1/Tue Dec 16 16:37:28 2008// +D diff --git a/dev-libs/boost/files/CVS/Repository b/dev-libs/boost/files/CVS/Repository new file mode 100644 index 0000000..21d0cd9 --- /dev/null +++ b/dev-libs/boost/files/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/dev-libs/boost/files diff --git a/dev-libs/boost/files/CVS/Root b/dev-libs/boost/files/CVS/Root new file mode 100644 index 0000000..94453ca --- /dev/null +++ b/dev-libs/boost/files/CVS/Root @@ -0,0 +1 @@ +:ext:hwoarang@cvs.gentoo.org:/var/cvsroot diff --git a/dev-libs/boost/files/boost-1.42.0-gcc45-python.patch b/dev-libs/boost/files/boost-1.42.0-gcc45-python.patch new file mode 100644 index 0000000..b415289 --- /dev/null +++ b/dev-libs/boost/files/boost-1.42.0-gcc45-python.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/317997 +https://svn.boost.org/trac/boost/ticket/4223 +https://svn.boost.org/trac/boost/changeset/62198 + +--- a/boost/python/exception_translator.hpp ++++ b/boost/python/exception_translator.hpp +@@ -18,7 +18,7 @@ template <class ExceptionType, class Translate> + void register_exception_translator(Translate translate, boost::type<ExceptionType>* = 0) + { + detail::register_exception_handler( +- bind<bool>(detail::translate_exception<ExceptionType,Translate>(), _1, _2, translate) ++ boost::bind<bool>(detail::translate_exception<ExceptionType,Translate>(), _1, _2, translate) + ); + } + diff --git a/dev-libs/boost/files/boost-1.42.0-parameter-needs-python.patch b/dev-libs/boost/files/boost-1.42.0-parameter-needs-python.patch new file mode 100644 index 0000000..2002ba3 --- /dev/null +++ b/dev-libs/boost/files/boost-1.42.0-parameter-needs-python.patch @@ -0,0 +1,106 @@ +--- boost/parameter/aux_/maybe.hpp 2008-03-22 21:45:55.000000000 +0000 ++++ boost/parameter/aux_/maybe.hpp.new 2009-10-22 03:55:24.000000000 +0000 +@@ -2,20 +2,41 @@ + // subject to the Boost Software License, Version 1.0. (See accompanying + // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +-#ifndef BOOST_PARAMETER_MAYBE_060211_HPP +-# define BOOST_PARAMETER_MAYBE_060211_HPP ++// ++// 2009.10.21 TDS remove depenency on boost::python::detail::referent_storage ++// ++#ifndef BOOST_PARAMETER_MAYBE_091021_HPP ++# define BOOST_PARAMETER_MAYBE_091021_HPP + + # include <boost/mpl/if.hpp> + # include <boost/mpl/identity.hpp> + # include <boost/type_traits/is_reference.hpp> + # include <boost/type_traits/add_reference.hpp> + # include <boost/optional.hpp> +-# include <boost/python/detail/referent_storage.hpp> ++# include <boost/aligned_storage.hpp> + # include <boost/type_traits/remove_cv.hpp> + # include <boost/type_traits/add_const.hpp> + + namespace boost { namespace parameter { namespace aux { + ++template <class T> struct referent_size; ++ ++template <class T> ++struct referent_size<T&> ++{ ++ BOOST_STATIC_CONSTANT(std::size_t, value = sizeof(T)); ++}; ++ ++// A metafunction returning a POD type which can store U, where T == ++// U&. If T is not a reference type, returns a POD which can store T. ++template <class T> ++struct referent_storage ++{ ++ typedef typename boost::aligned_storage< ++ referent_size<T>::value ++ >::type type; ++}; ++ + struct maybe_base {}; + + template <class T> +@@ -33,8 +54,8 @@ + BOOST_DEDUCED_TYPENAME remove_reference<reference>::type + >::type non_cv_value; + +- explicit maybe(T value) +- : value(value) ++ explicit maybe(T value_) ++ : value(value_) + , constructed(false) + {} + +@@ -48,28 +69,28 @@ + this->destroy(); + } + +- reference construct(reference value) const ++ reference construct(reference value_) const + { +- return value; ++ return value_; + } + + template <class U> +- reference construct2(U const& value) const ++ reference construct2(U const& value_) const + { +- new (m_storage.bytes) non_cv_value(value); ++ new (m_storage.address()) non_cv_value(value_); + constructed = true; +- return *(non_cv_value*)m_storage.bytes; ++ return *(non_cv_value*)m_storage.address(); + } + + template <class U> +- reference construct(U const& value) const ++ reference construct(U const& value_) const + { +- return this->construct2(value); ++ return this->construct2(value_); + } + + void destroy() + { +- ((non_cv_value*)m_storage.bytes)->~non_cv_value(); ++ ((non_cv_value*)m_storage.address())->~non_cv_value(); + } + + typedef reference(maybe<T>::*safe_bool)() const; +@@ -87,7 +108,9 @@ + private: + boost::optional<T> value; + mutable bool constructed; +- mutable typename boost::python::detail::referent_storage< ++ ++ ++ mutable typename referent_storage< + reference + >::type m_storage; + }; diff --git a/dev-libs/boost/files/boost-1.42.0-template_arity-gcc45.patch b/dev-libs/boost/files/boost-1.42.0-template_arity-gcc45.patch new file mode 100644 index 0000000..4a49879 --- /dev/null +++ b/dev-libs/boost/files/boost-1.42.0-template_arity-gcc45.patch @@ -0,0 +1,28 @@ +MPL is broken with GCC 4.5. + +https://bugs.gentoo.org/317969 +https://svn.boost.org/trac/boost/ticket/4061 +https://svn.boost.org/trac/boost/changeset/61467 + +--- a/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp ++++ b/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp +@@ -83,7 +81,7 @@ template< typename F, int N > + struct template_arity_impl + { + BOOST_STATIC_CONSTANT(int, value = +- sizeof(arity_helper(type_wrapper<F>(), arity_tag<N>())) - 1 ++ sizeof(::boost::mpl::aux::arity_helper(type_wrapper<F>(), arity_tag<N>())) - 1 + ); + }; + +--- a/boost/mpl/aux_/template_arity.hpp ++++ b/boost/mpl/aux_/template_arity.hpp +@@ -98,7 +98,7 @@ template< typename F, BOOST_MPL_AUX_NTTP_DECL(int, N) > + struct template_arity_impl + { + BOOST_STATIC_CONSTANT(int, value = +- sizeof(arity_helper(type_wrapper<F>(),arity_tag<N>())) - 1 ++ sizeof(::boost::mpl::aux::arity_helper(type_wrapper<F>(),arity_tag<N>())) - 1 + ); + }; + diff --git a/dev-libs/boost/files/boost-1.45.0-lambda_bind.patch b/dev-libs/boost/files/boost-1.45.0-lambda_bind.patch new file mode 100644 index 0000000..0b800e9 --- /dev/null +++ b/dev-libs/boost/files/boost-1.45.0-lambda_bind.patch @@ -0,0 +1,42 @@ +Index: trunk/boost/lambda/detail/function_adaptors.hpp +=================================================================== +--- a/trunk/boost/lambda/detail/function_adaptors.hpp ++++ b/trunk/boost/lambda/detail/function_adaptors.hpp +@@ -17,4 +17,7 @@ + #include "boost/type_traits/same_traits.hpp" + #include "boost/type_traits/remove_reference.hpp" ++#include "boost/type_traits/remove_cv.hpp" ++#include "boost/type_traits/add_const.hpp" ++#include "boost/type_traits/add_volatile.hpp" + #include "boost/utility/result_of.hpp" + +@@ -238,12 +241,14 @@ + template<class Args> class sig { + typedef typename boost::tuples::element<1, Args>::type argument_type; +- +- typedef typename detail::IF<boost::is_const<argument_type>::value, ++ typedef typename boost::remove_reference< ++ argument_type ++ >::type unref_type; ++ ++ typedef typename detail::IF<boost::is_const<unref_type>::value, + typename boost::add_const<T>::type, + T + >::RET properly_consted_return_type; + +- typedef typename detail::IF< +- boost::is_volatile<properly_consted_return_type>::value, ++ typedef typename detail::IF<boost::is_volatile<unref_type>::value, + typename boost::add_volatile<properly_consted_return_type>::type, + properly_consted_return_type +@@ -252,6 +257,8 @@ + + public: +- typedef typename +- boost::add_reference<properly_cvd_return_type>::type type; ++ typedef typename detail::IF<boost::is_reference<argument_type>::value, ++ typename boost::add_reference<properly_cvd_return_type>::type, ++ typename boost::remove_cv<T>::type ++ >::RET type; + }; + diff --git a/dev-libs/boost/files/buildid-fix.patch b/dev-libs/boost/files/buildid-fix.patch new file mode 100644 index 0000000..2786f7c --- /dev/null +++ b/dev-libs/boost/files/buildid-fix.patch @@ -0,0 +1,23 @@ +--- Jamroot.orig 2009-02-10 17:36:25.000000000 +0100 ++++ Jamroot 2009-02-10 17:37:09.000000000 +0100 +@@ -442,15 +442,15 @@ + local noversion-file ; + if $(nt) + { +- noversion-file = [ MATCH "(.*)-[0-9_]+([.]lib)" : $(name) ] ; ++ noversion-file = [ MATCH "(.*)-[0-9_]+(.*[.]lib)" : $(name) ] ; + } + else + { + noversion-file = +- [ MATCH "(.*)-[0-9_]+([.]so)[.0-9]*" : $(name) ] +- [ MATCH "(.*)-[0-9_]+([.]dylib)" : $(name) ] +- [ MATCH "(.*)-[0-9_]+([.]a)" : $(name) ] +- [ MATCH "(.*)-[0-9_]+([.]dll[.]a)" : $(name) ] ; ++ [ MATCH "(.*)-[0-9_]+(.*[.]so)[.0-9]*" : $(name) ] ++ [ MATCH "(.*)-[0-9_]+(.*[.]dylib)" : $(name) ] ++ [ MATCH "(.*)-[0-9_]+(.*[.]a)" : $(name) ] ++ [ MATCH "(.*)-[0-9_]+(.*[.]dll[.]a)" : $(name) ] ; + } + + local new-name = diff --git a/dev-libs/boost/files/random-Jamfile b/dev-libs/boost/files/random-Jamfile new file mode 100644 index 0000000..5cb6f6b --- /dev/null +++ b/dev-libs/boost/files/random-Jamfile @@ -0,0 +1,15 @@ +# Copyright (c) 2006 Tiziano Mueller +# +# Use, modification and distribution of the file is subject to the +# Boost Software License, Version 1.0. +# (See at http://www.boost.org/LICENSE_1_0.txt) + + +project boost/random + : source-location ../ ; + +SOURCES = random_device ; + +lib boost_random + : $(SOURCES).cpp + : <link>shared:<define>BOOST_RANDOM_DYN_LINK=1 ; diff --git a/dev-libs/boost/files/random-Jamfile-1.45.0 b/dev-libs/boost/files/random-Jamfile-1.45.0 new file mode 100644 index 0000000..81fb136 --- /dev/null +++ b/dev-libs/boost/files/random-Jamfile-1.45.0 @@ -0,0 +1,15 @@ +# Copyright (c) 2006 Tiziano Mueller +# +# Use, modification and distribution of the file is subject to the +# Boost Software License, Version 1.0. +# (See at http://www.boost.org/LICENSE_1_0.txt) + + +project boost/random + : source-location ../src ; + +SOURCES = random_device ; + +lib boost_random + : $(SOURCES).cpp + : <link>shared:<define>BOOST_RANDOM_DYN_LINK=1 ; diff --git a/dev-libs/boost/files/remove-toolset-1.45.0.patch b/dev-libs/boost/files/remove-toolset-1.45.0.patch new file mode 100644 index 0000000..c80191c --- /dev/null +++ b/dev-libs/boost/files/remove-toolset-1.45.0.patch @@ -0,0 +1,11 @@ +--- Jamroot 2010-11-17 11:51:56.000000000 +0200 ++++ Jamroot.gentoo 2011-01-06 15:07:17.893270002 +0200 +@@ -377,7 +377,7 @@ + if $(layout) = versioned + { + result = [ common.format-name +- <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG) ++ <base> <threading> <runtime> -$(BOOST_VERSION_TAG) + -$(BUILD_ID) + : $(name) : $(type) : $(property-set) ] ; + } diff --git a/dev-libs/boost/files/remove_toolset_from_targetname.patch b/dev-libs/boost/files/remove_toolset_from_targetname.patch new file mode 100644 index 0000000..1a0cb1c --- /dev/null +++ b/dev-libs/boost/files/remove_toolset_from_targetname.patch @@ -0,0 +1,11 @@ +--- boost_1_36_0/Jamroot.orig 2008-11-14 16:36:10.000000000 +0100 ++++ boost_1_36_0/Jamroot 2008-11-14 16:36:54.000000000 +0100 +@@ -311,7 +311,7 @@ + if $(layout) = versioned + { + local result = [ common.format-name +- <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG) ++ <base> <threading> <runtime> -$(BOOST_VERSION_TAG) + -$(BUILD_ID) + : $(name) : $(type) : $(property-set) ] ; + diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest new file mode 100644 index 0000000..1b5c4e3 --- /dev/null +++ b/dev-util/boost-build/Manifest @@ -0,0 +1,6 @@ +AUX 1.35.0-fix_broken_icu_build.patch 1752 RMD160 0e7ee05c17d76e29abff915e84181361e4095b89 SHA1 273de1fa957091bf3c0d041f54aec9797810f3cf SHA256 71d858236c47b835947d996d3caf0a1de96ace267140d52dd09594db3a96729d +AUX boost-1.41-fix-mpich2-detection.patch 1378 RMD160 fd81c6a03dd8bf2d6afdaf3fa4957ee0ff1f6e10 SHA1 bbe5ba6fb554ab89e5fa4649f8a44ad7cd1dfa80 SHA256 8e1adadb1345ff045930bbd1c6d9d6e4b06462de2939021bf9e3a3fe1c9d6100 +AUX boost-1.42-fix-mpich2-detection.patch 1378 RMD160 fd81c6a03dd8bf2d6afdaf3fa4957ee0ff1f6e10 SHA1 bbe5ba6fb554ab89e5fa4649f8a44ad7cd1dfa80 SHA256 8e1adadb1345ff045930bbd1c6d9d6e4b06462de2939021bf9e3a3fe1c9d6100 +AUX boost-build-1.42-env-whitespace.patch 683 RMD160 a96ff55a09a889c5fba0c898cc7d4c2a6d2ef1a5 SHA1 9fd231fc699813df1d3ba78ae95f5f322166ade7 SHA256 52714f45a54cad8c126d5fca8bd5eacc4d746b29df24aaa9d2c55e3694a6f4aa +DIST boost_1_46_1.tar.bz2 42001335 RMD160 bb43b39f7c4b683b80bafa3042b95e65a242d9c3 SHA1 3ca6e173ec805e5126868d8a03618e587aa26aef SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d04469cbeee05e43ea19236416d883 +EBUILD boost-build-1.46.1.ebuild 3309 RMD160 70f308ca0f6322d6cdd2f95746be7ce0abc610f9 SHA1 511990fc07e64b1941227747c43feedf68d53712 SHA256 889fc96586966fd52db2bfa1cfcf296dda766bf0fc996f0a643f69da07874c06 diff --git a/dev-util/boost-build/boost-build-1.46.1.ebuild b/dev-util/boost-build/boost-build-1.46.1.ebuild new file mode 100644 index 0000000..6c9c2a4 --- /dev/null +++ b/dev-util/boost-build/boost-build-1.46.1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.45.0.ebuild,v 1.1 2011/01/06 14:00:10 dev-zero Exp $ + +EAPI="2" + +inherit eutils flag-o-matic toolchain-funcs versionator + +MY_PV=$(replace_all_version_separators _) +MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))" + +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="$(get_version_component_range 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="examples python" + +DEPEND="!<dev-libs/boost-1.34.0 + !<=dev-util/boost-build-1.35.0-r1 + python? ( dev-lang/python )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/boost_${MY_PV}/tools/build/v2" + +src_unpack() { + tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed" +} + +src_prepare() { + # TODO: + # epatch "${FILESDIR}/boost-1.42-fix-mpich2-detection.patch" + + cd "${S}/engine" + epatch "${FILESDIR}/${PN}-1.42-env-whitespace.patch" # 293652 + + # Remove stripping option + cd "${S}/engine/src" + sed -i -e 's|-s\b||' \ + build.jam || die "sed failed" + + # Force regeneration + rm jambase.c + + # 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}" + sed -i \ + -e 's/\(off speed space\)/\1 none/' \ + -e 's/\(debug-symbols : on off\)/\1 none/' \ + tools/builtin.jam || die "sed failed" +} + +src_compile() { + cd engine/src + local toolset + + if [[ ${CHOST} == *-darwin* ]] ; then + toolset=darwin + else + # Using boost's generic toolset here, which respects CC and CFLAGS + toolset=cc + fi + + append-flags -fno-strict-aliasing + + # For slotting + sed -i \ + -e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \ + Jambase || die "sed failed" + + # The build.jam file for building bjam using a bootstrapped jam0 ignores + # the LDFLAGS env var (bug #209794). We have now two options: + # a) change the cc-target definition in build.jam to include separate compile + # and link targets to make it use the LDFLAGS var, or + # b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var + # (which should not be set by us). + if [[ -z "${LDFLAGS}" ]] ; then + CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \ + || die "building bjam failed" + else + LDFLAGS=$(echo ${LDFLAGS}) # 293652 + LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \ + $(use_with python) || die "building bjam failed" + fi +} + +src_install() { + newbin engine/src/bin.*/bjam bjam-${MAJOR_PV} + + cd "${S}" + insinto /usr/share/boost-build-${MAJOR_PV} + doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \ + build kernel options tools util || die + + dodoc changes.txt hacking.txt release_procedure.txt \ + notes/build_dir_option.txt notes/relative_source_paths.txt + + if use examples ; then + insinto /usr/share/doc/${PF} + doins -r example + fi +} + +src_test() { + cd engine/test + ./test.sh || die "tests failed" +} diff --git a/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch b/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch new file mode 100644 index 0000000..b461105 --- /dev/null +++ b/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch @@ -0,0 +1,33 @@ +--- trunk/tools/build/v2/build/targets.jam (revision 45072) ++++ trunk/tools/build/v2/build/targets.jam (revision 45245) +@@ -1170,5 +1170,5 @@ + ECHO [ targets.indent ] "Building target '$(fn)'" ; + targets.increase-indent ; +- ECHO [ targets.indent ] "Build request: " [ $(property-set).raw ] ; ++ ECHO [ targets.indent ] "Build request: " $(property-set) [ $(property-set).raw ] ; + local cf = [ build-system.command-line-free-features ] ; + ECHO [ targets.indent ] "Command line free features: " [ $(cf).raw ] ; +@@ -1275,5 +1275,14 @@ + # case we don't want any diagnostic. In the former case, we need + # diagnostics. FIXME +- self.generated.$(property-set) = $(rproperties) ; ++ ++ # If this target fails to build, add <build>no to properties ++ # to cause any parent target to fail to build. Except that it ++ # - does not work now, since we check for <build>no only in ++ # common properties, but not in properties that came from ++ # dependencies ++ # - it's not clear if that's a good idea anyway. The alias ++ # target, for example, should not fail to build if a dependency ++ # fails. ++ self.generated.$(property-set) = [ property-set.create <build>no ] ; + } + } +@@ -1283,4 +1292,7 @@ + { + ECHO [ targets.indent ] "Already built" ; ++ local ur = $(self.generated.$(property-set)) ; ++ ur = $(ur[0]) ; ++ ECHO [ targets.indent ] " Usage requirements " [ $(ur).raw ] ; + } + } diff --git a/dev-util/boost-build/files/CVS/Entries b/dev-util/boost-build/files/CVS/Entries new file mode 100644 index 0000000..8edebe8 --- /dev/null +++ b/dev-util/boost-build/files/CVS/Entries @@ -0,0 +1,5 @@ +/1.35.0-fix_broken_icu_build.patch/1.1/Thu Jun 5 20:04:08 2008// +/boost-1.41-fix-mpich2-detection.patch/1.1/Wed Dec 2 15:25:01 2009// +/boost-1.42-fix-mpich2-detection.patch/1.1/Wed Mar 3 12:32:09 2010// +/boost-build-1.42-env-whitespace.patch/1.1/Sat Aug 14 06:35:54 2010// +D diff --git a/dev-util/boost-build/files/CVS/Repository b/dev-util/boost-build/files/CVS/Repository new file mode 100644 index 0000000..28efdd8 --- /dev/null +++ b/dev-util/boost-build/files/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/dev-util/boost-build/files diff --git a/dev-util/boost-build/files/CVS/Root b/dev-util/boost-build/files/CVS/Root new file mode 100644 index 0000000..94453ca --- /dev/null +++ b/dev-util/boost-build/files/CVS/Root @@ -0,0 +1 @@ +:ext:hwoarang@cvs.gentoo.org:/var/cvsroot diff --git a/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch b/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch new file mode 100644 index 0000000..d3bd646 --- /dev/null +++ b/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch @@ -0,0 +1,35 @@ +Index: tools/build/v2/tools/mpi.jam +=================================================================== +--- tools/build/v2/tools/mpi.jam (revision 57744) ++++ tools/build/v2/tools/mpi.jam (working copy) +@@ -156,14 +156,27 @@ + # into a feature. + local match = [ MATCH "^(-.)(.*)" : $(cmdline) ] ; + local matched ; +- if $(match) && $(match[2]) { ++ if $(match) && $(match[2]) { + local prefix = $(match[1]) ; + if $(feature_kinds$(prefix)) { + local name = $(feature_kinds$(prefix)) ; + local add = [ add_feature $(prefix) $(name) $(cmdline) ] ; + + if $(add) { +- result += $(add[1]) ; ++ ++ if $(add[1]) = <find-shared-library>pthread ++ { ++ # Uhm. It's not really nice that this MPI implementation ++ # uses -lpthread as opposed to -pthread. We do want to ++ # set <threading>multi, instead of -lpthread. ++ result += "<threading>multi" ; ++ MPI_EXTRA_REQUIREMENTS += "<threading>multi" ; ++ } ++ else ++ { ++ result += $(add[1]) ; ++ } ++ + cmdline = $(add[2]) ; + matched = yes ; + } + diff --git a/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch b/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch new file mode 100644 index 0000000..d3bd646 --- /dev/null +++ b/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch @@ -0,0 +1,35 @@ +Index: tools/build/v2/tools/mpi.jam +=================================================================== +--- tools/build/v2/tools/mpi.jam (revision 57744) ++++ tools/build/v2/tools/mpi.jam (working copy) +@@ -156,14 +156,27 @@ + # into a feature. + local match = [ MATCH "^(-.)(.*)" : $(cmdline) ] ; + local matched ; +- if $(match) && $(match[2]) { ++ if $(match) && $(match[2]) { + local prefix = $(match[1]) ; + if $(feature_kinds$(prefix)) { + local name = $(feature_kinds$(prefix)) ; + local add = [ add_feature $(prefix) $(name) $(cmdline) ] ; + + if $(add) { +- result += $(add[1]) ; ++ ++ if $(add[1]) = <find-shared-library>pthread ++ { ++ # Uhm. It's not really nice that this MPI implementation ++ # uses -lpthread as opposed to -pthread. We do want to ++ # set <threading>multi, instead of -lpthread. ++ result += "<threading>multi" ; ++ MPI_EXTRA_REQUIREMENTS += "<threading>multi" ; ++ } ++ else ++ { ++ result += $(add[1]) ; ++ } ++ + cmdline = $(add[2]) ; + matched = yes ; + } + diff --git a/dev-util/boost-build/files/boost-build-1.42-env-whitespace.patch b/dev-util/boost-build/files/boost-build-1.42-env-whitespace.patch new file mode 100644 index 0000000..681de7a --- /dev/null +++ b/dev-util/boost-build/files/boost-build-1.42-env-whitespace.patch @@ -0,0 +1,25 @@ +diff --git a/tools/jam/src/build.jam b/tools/jam/src/build.jam +index e30e854..7b397a3 100644 +--- a/tools/jam/src/build.jam ++++ b/tools/jam/src/build.jam +@@ -2,6 +2,20 @@ + #~ 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) + ++# Clean env vars of any "extra" empty values. ++for local v in ARGV CC CFLAGS ++{ ++ local values ; ++ for local x in $($(v)) ++ { ++ if $(x) != "" ++ { ++ values += $(x) ; ++ } ++ } ++ $(v) = $(values) ; ++} ++ + # Platform related specifics. + if $(NT) { rule .path { return "$(<:J=\\)" ; } ./ = "/" ; } + else if $(OS2) { rule .path { return "$(<:J=\\)" ; } ./ = "/" ; } diff --git a/profiles/package.mask b/profiles/package.mask index 10cc721..6f4c141 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,4 +1,4 @@ -# Markos Chandras <hwoarang@gentoo.org> (06 Jan 2011) -# Totally unusable ebuilds. Progress is tracked on bug #320039 -~dev-libs/boost-1.45.0 -~dev-util/boost-build-1.45.0 +# Markos Chandras <hwoarang@gentoo.org> (14 Mar 2011) +# Totally unusable ebuilds. Progress is tracked on bug #356479 +~dev-libs/boost-1.46.1 +~dev-util/boost-build-1.46.1 |