diff options
author | Gregory M. Tuner <gmt@be-evil.net> | 2014-05-17 16:09:33 -0700 |
---|---|---|
committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-05-17 16:09:33 -0700 |
commit | f96d1b917bd693a62067d201f15e33fcaf1d6e54 (patch) | |
tree | e77ba9dabca70958b344d8074e4a1d4585b85acc /dev-libs | |
parent | unmask and drop virtual/krb5 -- upstream now has a multilibutized version (no... (diff) | |
download | gmt-f96d1b917bd693a62067d201f15e33fcaf1d6e54.tar.gz gmt-f96d1b917bd693a62067d201f15e33fcaf1d6e54.tar.bz2 gmt-f96d1b917bd693a62067d201f15e33fcaf1d6e54.zip |
dev-libs/boost: support a 1.52 version and other minor updates
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/boost/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.52.0-r7.ebuild | 347 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.53.0-r2.ebuild | 2 |
3 files changed, 351 insertions, 2 deletions
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index c6f53b7..0b2b386 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -13,9 +13,11 @@ AUX boost-1.53.0-glibc-2.18-compat.patch 949 SHA256 54e5e0000bcfb249a14cee584e37 AUX boost-1.53.0-library_status.patch 1907 SHA256 21a3137fcac21f734c7160264523f8699eb242a84a79dcc88cc937f0b1f87e67 SHA512 f5579a8650c24d2ace95e8d9aaff94325090577fa27fd7122309f5197373ff22352092671153c6e35057757fa07ef9c21ea5e0234fe1d5b467ef65cf5f2901c5 WHIRLPOOL 5a0962b007adbbfe85c33f03b9542d9ebf1ef649bf1d97f483cba5b0229cea0630c0ed7912bab8f04d8dd791b99cfd6e33e222d3a983e30852d7a10fd66a3dc7 AUX boost-1.55.0-context-x32.patch 1077 SHA256 1da4ff48b98416cac601c52594d4c4da3fb89d0a3e8908f119f05cc8ae76f9c7 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73 WHIRLPOOL 0b7a3521a8ec513b833d0292fa3e3bcafc8232fa96d2e41afd25da8dc30bdb49ee4319c7c8555d95e7d3de55fc704d83e443ba49bf89d6961a3f5af73c024a71 AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa SHA512 bbb01be2e4b4807eeb19faf13fc6c73e3cb8843953586312076a15c67ad5c5cac683fc3fb26f4e2902c60ab7930e83922f4d499756a85f78a20ac53399329f61 WHIRLPOOL 2490dac69a45b3f48e2513b4f21d75dc7cf5361411541dde96f027c66ca459df5390708902c86f11577d1129410f52d20de1ff275524fb51083a17eee6adc332 +DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746 DIST boost_1_55_0.tar.bz2 58146647 SHA256 fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 SHA512 dc606477f4c303e8f40de2586c16394b6d758e198b35bf3a7d3e576a2f49171aadc4f95e8d685fa731bc4e61e19869d5a24e1e816febfca9de078d66e096e041 WHIRLPOOL 6ae111d6a956651bd91914432b743faffeb466703191b05193db47f02fd3528a14ce200f26c1ab77bf2c68994eb5b135b0176f66a746964d334b4793ba113ad5 -EBUILD boost-1.53.0-r2.ebuild 10196 SHA256 16491a8bfc941efa9809eb60af7374643983720f3539cfb2d9488ff135d11995 SHA512 9e49368edd64489051006d17798ff050736c8bdf4076080ae7a7d441f513206d443e69b523a9fad7e7d3b5bc0e62b320ad9ee0ea7f8a7d25b3fe475d20ab7a8f WHIRLPOOL e2da7bf590f0146fb2caf95c92bd66b3db8d90fb6b5ad04a91fda5065f2d4b36ca9f78e5fd70e17a899ac48542d5a951cbe6852bdf040545bd66901bf50e9479 +EBUILD boost-1.52.0-r7.ebuild 9610 SHA256 4dd2e1a6418aa213c7b1954a8407bb26214412f2c565faa533d28181804919c9 SHA512 509a3170f47decebbacaf580a373e6ffc6b282d822f8fff0ad59a096c9a4203279a39c55cfc2f987f56c4c31bf2a3a8a59f2fd09931d3c2eba6efe2344697154 WHIRLPOOL 725769ae6f7d696859ce35d82d79f45d87b248ee2bce18df8d0cea9daa3ead8db901a86fa9f19b9c238b618b8400d48096033402284f50c6c82f7a64b62a4b75 +EBUILD boost-1.53.0-r2.ebuild 10086 SHA256 03e52d13645e69fce43b8a49a2fdcfdfe736a77f839c0ba4808b9f6bfc98f0e6 SHA512 4722d1a60a95e6275ceb23700b3f4ebdc3a764b91fd4576ae853f8f56ac64ad3f47f4635ea993e165bcf1d76d3e79b55fec89ce4b23037a49c8e3a4f9b7c57bb WHIRLPOOL c7c6fa4bf692b378c5afeada9feb25053a9b52d4a3830d0de0f922f53ceca5f4feafcf9b407a4d4321e189a27562dedd04913489d3ba0d6e7f7502ab6edede5d EBUILD boost-1.55.0-r2.ebuild 9908 SHA256 7efee55cafe938630185bf56dab261568e04dd5e454257f41d7918dfbf5dec57 SHA512 bd79ee6ec10c0028a3a32225899dd3ca3c161f59c748d26bb52faef9ea83791c5a2c54fcaa89eee4848c06d270d2fa98b14f5803c8fdb28c81f1c9ada0f43dcf WHIRLPOOL eeef2c5b6d0d81a2937c9bf8273f683d7318e81186b666fede28071c460849694173ecdb217a2586fc69a4b32dffc253085a5bae770807a298abc71338e3af9e MISC ChangeLog 52988 SHA256 d87ab7ce88fbf094c6f48823fc91017db0d06256474bea91aac382b9851d7421 SHA512 06603a7a8430c1fa4c8952d12682b22a60119e63b95546801c96ca3e3a61cf76623b7284686cef2b2eae48120add42840a45e3b552e105d2f2d426fadf6c227d WHIRLPOOL d290b2bc5a82389e0302290914411465aa8532854d908bcd5818e25ef772c0cd0beb2389bef2f9c1dc5895130b65b4229e325c0e9d6d509e23d25b573064010a MISC metadata.xml 1363 SHA256 81717d0ffd5ebadbe4b12d4a38b332f3128da205a46e3cfd201e91f6ad474d68 SHA512 162040a40e83cceacea3605d45bc846cbd721446949c66bd836ab54e113ada77f1f462c7e61d7e544bc073920475db6b81c104390d6c83aba7228d65ff270419 WHIRLPOOL be141d041846a3a79efb7579c3f842960afe27a6e29659bad88ae8e999aef30074d2ab23c9eb295152d88f75d80efc86fed1c08c11b4f3f0d5e866b6d3c4802c diff --git a/dev-libs/boost/boost-1.52.0-r7.ebuild b/dev-libs/boost/boost-1.52.0-r7.ebuild new file mode 100644 index 0000000..cf90ef4 --- /dev/null +++ b/dev-libs/boost/boost-1.52.0-r7.ebuild @@ -0,0 +1,347 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) + +inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator + +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" +MAJOR_V="$(get_version_component_range 1-2)" +SLOT="0/${MAJOR_V}" +KEYWORDS="~amd64" +IUSE="debug doc icu +nls mpi python static-libs +threads tools" + +RDEPEND="icu? ( >=dev-libs/icu-3.6:= ) + !icu? ( virtual/libiconv ) + mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) + python? ( ${PYTHON_DEPS} ) + app-arch/bzip2 + sys-libs/zlib + !app-admin/eselect-boost" +DEPEND="${RDEPEND} + =dev-util/boost-build-1.52.0-r1" + +S="${WORKDIR}/${MY_P}" + +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 use python; then + python_configuration="using python : : ${PYTHON} ;" + fi + + cat > user-config.jam << __EOF__ +using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; +${mpi_configuration} +${python_configuration} +__EOF__ +} + +src_prepare() { + epatch \ + "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \ + "${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}/remove-toolset-1.48.0.patch" \ + "${FILESDIR}/${PN}-1.52.0-tuple.patch" \ + "${FILESDIR}/${P}-locale-utf.patch" + + # Avoid a patch for now + for file in libs/context/src/asm/*.S; do + cat - >> $file <<EOF + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif +EOF + done +} + +ejam() { + echo b2 "$@" + b2 "$@" +} + +src_configure() { + OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2 --user-config=${S}/user-config.jam" + + 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 + 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 python || OPTIONS+=" --without-python" + use nls || OPTIONS+=" --without-locale" + + OPTIONS+=" pch=off --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs shared,static shared) --without-context" +} + +src_compile() { + export BOOST_ROOT="${S}" + PYTHON_DIRS="" + MPI_PYTHON_MODULE="" + + building() { + if use python; then + evar_push CFLAGS CXXFLAGS + append-cflags $(python_get_CFLAGS) + append-cxxflags $(python_get_CFLAGS) + einfo "for ${PYTHON} using CFLAGS \"${CFLAGS}\" and CXXFLAGS \"${CXXFLAGS}\"." + fi + + create_user-config.jam + + ejam ${OPTIONS} \ + $(use python && echo --python-buildid=${EPYTHON#python}) \ + || die "Building of Boost libraries failed" + + if use python; 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 + evar_pop 2 + fi + } + if use python; then + python_foreach_impl building + else + building + fi + + if use tools; then + pushd tools > /dev/null || die + + ejam ${OPTIONS} \ + || die "Building of Boost tools failed" + popd > /dev/null || die + fi +} + +src_install () { + installation() { + if use python; then + evar_push CFLAGS CXXFLAGS + append-cflags $(python_get_CFLAGS) + append-cxxflags $(python_get_CFLAGS) + einfo "for ${PYTHON} using CFLAGS \"${CFLAGS}\" and CXXFLAGS \"${CXXFLAGS}\"." + fi + + create_user-config.jam + + if use python; 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 + fi + + ejam ${OPTIONS} \ + --includedir="${ED}usr/include" \ + --libdir="${ED}usr/$(get_libdir)" \ + $(use python && echo --python-buildid=${EPYTHON#python}) \ + install || die "Installation of Boost libraries failed" + + if use python; 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 + evar_pop 2 + fi + } + if use python; then + python_foreach_impl installation + else + installation + fi + + 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 + + rm -r "${ED}"/usr/include/boost/context || die + + 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 + + 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 use tools; 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 +} + +# 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. +src_test() { :; } diff --git a/dev-libs/boost/boost-1.53.0-r2.ebuild b/dev-libs/boost/boost-1.53.0-r2.ebuild index f4655d3..24d9344 100644 --- a/dev-libs/boost/boost-1.53.0-r2.ebuild +++ b/dev-libs/boost/boost-1.53.0-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2" LICENSE="Boost-1.0" MAJOR_V="$(get_version_component_range 1-2)" SLOT="0/${MAJOR_V}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux" +KEYWORDS="~amd64" IUSE="debug doc icu +nls mpi python static-libs +threads tools" RDEPEND="icu? ( >=dev-libs/icu-3.6:= ) |