diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/boost/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/boost/files')
18 files changed, 878 insertions, 0 deletions
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 000000000000..a902d61bba78 --- /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 = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ; +- ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ; ++ ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; ++ ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; + } + else + { +@@ -117,7 +117,6 @@ + <library>icuuc/<link>shared/<runtime-link>shared + <library>icudt/<link>shared/<runtime-link>shared + <library>icuin/<link>shared/<runtime-link>shared +- <dll-path>$(ICU_PATH)/bin + <runtime-link>shared ; + + +@@ -176,7 +175,6 @@ + <library>icuuc_64/<link>shared/<runtime-link>shared + <library>icudt_64/<link>shared/<runtime-link>shared + <library>icuin_64/<link>shared/<runtime-link>shared +- <dll-path>$(ICU_PATH)/bin64 + <runtime-link>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 000000000000..c24a56c6bd5d --- /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 @@ + <dependency>config-warning + + <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- [ cond $(is-py3) : <python>$(py3-version) ] + : # default build + <link>shared + : # usage requirements +@@ -160,9 +142,3 @@ + + lib_boost_python ; + boost-install boost_python ; +- +-if $(py3-version) +-{ +- lib_boost_python yes ; +- boost-install boost_python3 ; +-} diff --git a/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch b/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch new file mode 100644 index 000000000000..a32eca94b90b --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch @@ -0,0 +1,95 @@ +https://svn.boost.org/trac/boost/ticket/4657 +https://svn.boost.org/trac/boost/changeset/76290 + +--- libs/mpi/src/python/datatypes.cpp ++++ libs/mpi/src/python/datatypes.cpp +@@ -17,7 +17,9 @@ + + void export_datatypes() + { ++#if PY_MAJOR_VERSION < 3 + register_serialized(long(0), &PyInt_Type); ++#endif + register_serialized(false, &PyBool_Type); + register_serialized(double(0.0), &PyFloat_Type); + } +--- libs/mpi/src/python/py_environment.cpp ++++ libs/mpi/src/python/py_environment.cpp +@@ -11,6 +11,9 @@ + * This file reflects the Boost.MPI "environment" class into Python + * methods at module level. + */ ++ ++#include <locale> ++#include <string> + #include <boost/python.hpp> + #include <boost/mpi.hpp> + +@@ -50,11 +53,64 @@ + + // If anything changed, convert C-style argc/argv into Python argv + if (mpi_argv != my_argv) ++ { ++#if PY_MAJOR_VERSION >= 3 ++ ++ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); ++ /* We need a second copy, as Python might modify the first one. */ ++ wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); ++ ++ if (!argv_copy || !argv_copy2) { ++ fprintf(stderr, "out of memory\n"); ++ return false; ++ } ++ ++ std::locale mylocale; ++ mbstate_t mystate; ++ ++ const std::codecvt<char, wchar_t, mbstate_t>& myfacet = ++ std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale); ++ ++ for (int i = 0; i < mpi_argc; i++) ++ { ++ size_t length = strlen(mpi_argv[i]); ++ ++ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1)); ++ ++ const char *from_next; ++ wchar_t *to_next; ++ ++ std::codecvt<wchar_t,char,mbstate_t>::result myresult = ++ myfacet.out(mystate, ++ mpi_argv[i], mpi_argv[i] + length + 1, from_next, ++ dest, dest+length+1, to_next); ++ ++ if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok ) ++ { ++ fprintf(stderr, "failure translating argv\n"); ++ return 1; ++ } ++ ++ argv_copy2[i] = argv_copy[i] = dest; ++ if (!argv_copy[i]) ++ return false; ++ } ++ ++ PySys_SetArgv(mpi_argc, argv_copy); ++ ++ for (int i = 0; i < mpi_argc; i++) { ++ PyMem_Free(argv_copy2[i]); ++ } ++ PyMem_Free(argv_copy); ++ PyMem_Free(argv_copy2); ++#else + PySys_SetArgv(mpi_argc, mpi_argv); ++#endif ++ } + +- for (int arg = 0; arg < my_argc; ++arg) +- free(my_argv[arg]); +- delete [] my_argv; ++ for (int arg = 0; arg < mpi_argc; ++arg) ++ free(mpi_argv[arg]); ++ delete [] mpi_argv; + + return true; + } diff --git a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch new file mode 100644 index 000000000000..89f8109a411b --- /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 + <link>static:<define>BOOST_PYTHON_STATIC_LIB + <define>BOOST_PYTHON_SOURCE ++ [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] + + # On Windows, all code using Python has to link to the Python + # import library. diff --git a/dev-libs/boost/files/boost-1.48.0-python_linking.patch b/dev-libs/boost/files/boost-1.48.0-python_linking.patch new file mode 100644 index 000000000000..e7f4e7c99f24 --- /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 @@ + <link>static:<define>BOOST_PYTHON_STATIC_LIB + <define>BOOST_PYTHON_SOURCE + [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] +- +- # On Windows, all code using Python has to link to the Python +- # import library. +- # +- # On *nix we never link libboost_python to libpython. When +- # extending Python, all Python symbols are provided by the +- # Python interpreter executable. When embedding Python, the +- # client executable is expected to explicitly link to +- # /python//python (the target representing libpython) itself. +- # +- # python_for_extensions is a target defined by Boost.Build to +- # provide the Python include paths, and on Windows, the Python +- # import library, as usage requirements. +- [ cond [ python.configured ] : <library>/python//python_for_extensions ] ++ [ cond [ python.configured ] : <library>/python//python ] + + # we prevent building when there is no python available + # as it's not possible anyway, and to cause dependents to diff --git a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch new file mode 100644 index 000000000000..327429e2c0b2 --- /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 @@ + <tag>@$(__name__).tag + ; + ++# Python build id (for Python libraries only). ++python-id = [ option.get "python-buildid" ] ; ++if $(python-id) ++{ ++ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; ++} ++ + rule tag ( name : type ? : property-set ) + { + local result = $(name) ; +--- 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 000000000000..c8dc6e1b7e49 --- /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-locale-utf.patch b/dev-libs/boost/files/boost-1.52.0-locale-utf.patch new file mode 100644 index 000000000000..7ef51e94797b --- /dev/null +++ b/dev-libs/boost/files/boost-1.52.0-locale-utf.patch @@ -0,0 +1,52 @@ +Index: boost/locale/utf.hpp +=================================================================== +--- boost/locale/utf.hpp (revision 81589) ++++ boost/locale/utf.hpp (revision 81590) +@@ -219,16 +219,22 @@ + if(BOOST_LOCALE_UNLIKELY(p==e)) + return incomplete; + tmp = *p++; ++ if (!is_trail(tmp)) ++ return illegal; + c = (c << 6) | ( tmp & 0x3F); + case 2: + if(BOOST_LOCALE_UNLIKELY(p==e)) + return incomplete; + tmp = *p++; ++ if (!is_trail(tmp)) ++ return illegal; + c = (c << 6) | ( tmp & 0x3F); + case 1: + if(BOOST_LOCALE_UNLIKELY(p==e)) + return incomplete; + tmp = *p++; ++ if (!is_trail(tmp)) ++ return illegal; + c = (c << 6) | ( tmp & 0x3F); + } + +Index: libs/locale/test/test_codepage_converter.cpp +=================================================================== +--- libs/locale/test/test_codepage_converter.cpp (revision 81589) ++++ libs/locale/test/test_codepage_converter.cpp (revision 81590) +@@ -140,6 +140,20 @@ + TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000 + TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff + ++ std::cout << "-- Invalid trail" << std::endl; ++ TEST_TO("\xC2\x7F",illegal); ++ TEST_TO("\xdf\x7F",illegal); ++ TEST_TO("\xe0\x7F\x80",illegal); ++ TEST_TO("\xef\xbf\x7F",illegal); ++ TEST_TO("\xe0\x7F\x80",illegal); ++ TEST_TO("\xef\xbf\x7F",illegal); ++ TEST_TO("\xf0\x7F\x80\x80",illegal); ++ TEST_TO("\xf4\x7f\xbf\xbf",illegal); ++ TEST_TO("\xf0\x90\x7F\x80",illegal); ++ TEST_TO("\xf4\x8f\x7F\xbf",illegal); ++ TEST_TO("\xf0\x90\x80\x7F",illegal); ++ TEST_TO("\xf4\x8f\xbf\x7F",illegal); ++ + std::cout << "-- Invalid length" << std::endl; + + /// Test that this actually works 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 000000000000..e078fc2e106f --- /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 : <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.52.0-tuple.patch b/dev-libs/boost/files/boost-1.52.0-tuple.patch new file mode 100644 index 000000000000..08bab8600b86 --- /dev/null +++ b/dev-libs/boost/files/boost-1.52.0-tuple.patch @@ -0,0 +1,11 @@ +--- boost/signals2/detail/variadic_slot_invoker.hpp.org 2012-11-20 09:15:55.000000000 +0400 ++++ boost/signals2/detail/variadic_slot_invoker.hpp 2012-11-20 09:19:56.000000000 +0400 +@@ -20,7 +20,7 @@ + // if compiler has std::tuple use it instead of boost::tuple + // because boost::tuple does not have variadic template support at present. + #ifdef BOOST_NO_CXX11_HDR_TUPLE +-#include <boost/tuple.hpp> ++#include <boost/tuple/tuple.hpp> + #define BOOST_SIGNALS2_TUPLE boost::tuple + #else + #include <tuple> diff --git a/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch b/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch new file mode 100644 index 000000000000..54d2e2990205 --- /dev/null +++ b/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch @@ -0,0 +1,18 @@ +Patch for compatibility with glibc 2.18 +Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=482372 +Upstream fix: https://svn.boost.org/trac/boost/changeset/84950 + +--- boost_1_53_0/boost/cstdint.hpp 2012-12-11 22:42:26.000000000 +0800 ++++ boost_1_53_0.fix/boost/cstdint.hpp 2013-08-25 20:48:53.683000000 +0800 +@@ -41,7 +41,10 @@ + // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG. + // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 + // +-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG)) ++#if defined(BOOST_HAS_STDINT_H) \ ++ && (!defined(__GLIBC__) \ ++ || defined(__GLIBC_HAVE_LONG_LONG) \ ++ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) + + // The following #include is an implementation artifact; not part of interface. + # ifdef __hpux diff --git a/dev-libs/boost/files/boost-1.53.0-library_status.patch b/dev-libs/boost/files/boost-1.53.0-library_status.patch new file mode 100644 index 000000000000..7d10461795f4 --- /dev/null +++ b/dev-libs/boost/files/boost-1.53.0-library_status.patch @@ -0,0 +1,57 @@ +--- tools_orig/regression/src/library_status.cpp 2012-12-11 15:42:26.000000000 +0100 ++++ tools/regression/src/library_status.cpp 2013-07-11 16:15:54.000000000 +0200 +@@ -171,16 +171,17 @@ + // find_element ------------------------------------------------------------// + ++ struct element_equal { ++ const string & m_name; ++ element_equal(const string & name) : ++ m_name(name) ++ {} ++ bool operator()(const xml::element_ptr & xep) const { ++ return xep.get()->name == m_name; ++ } ++ }; ++ + xml::element_list::const_iterator find_element( + const xml::element & root, const string & name + ){ +- struct element_equal { +- const string & m_name; +- element_equal(const string & name) : +- m_name(name) +- {} +- bool operator()(const xml::element_ptr & xep) const { +- return xep.get()->name == m_name; +- } +- }; + return std::find_if( + root.elements.begin(), +@@ -203,17 +204,18 @@ + // attribute_value ----------------------------------------------------------// + ++ struct attribute_equal { ++ const string & m_name; ++ attribute_equal(const string & name) : ++ m_name(name) ++ {} ++ bool operator()(const xml::attribute & a) const { ++ return a.name == m_name; ++ } ++ }; ++ + const string & attribute_value( + const xml::element & element, + const string & attribute_name + ){ +- struct attribute_equal { +- const string & m_name; +- attribute_equal(const string & name) : +- m_name(name) +- {} +- bool operator()(const xml::attribute & a) const { +- return a.name == m_name; +- } +- }; + xml::attribute_list::const_iterator itr; + itr = std::find_if( 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 000000000000..5bf740625381 --- /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 000000000000..df2a14a34ae4 --- /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.55.0-variadic-templates.patch b/dev-libs/boost/files/boost-1.55.0-variadic-templates.patch new file mode 100644 index 000000000000..547dbbd5caab --- /dev/null +++ b/dev-libs/boost/files/boost-1.55.0-variadic-templates.patch @@ -0,0 +1,37 @@ +From eec808554936ae068b23df07ab54d4dc6302a695 Mon Sep 17 00:00:00 2001 +From: jzmaddock <jzmaddock@gmail.com> +Date: Sat, 23 Aug 2014 09:38:02 +0100 +Subject: [PATCH] Fix BOOST_NO_CXX11_VARIADIC_TEMPLATES definition - the + feature was introduced in GCC 4.4. + +--- + boost/config/compiler/gcc.hpp | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/boost/config/compiler/gcc.hpp b/boost/config/compiler/gcc.hpp +index f37159d..97d8a18 100644 +--- a/boost/config/compiler/gcc.hpp ++++ b/boost/config/compiler/gcc.hpp +@@ -154,14 +154,6 @@ + # define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS + # define BOOST_NO_CXX11_RVALUE_REFERENCES + # define BOOST_NO_CXX11_STATIC_ASSERT +- +-// Variadic templates compiler: +-// http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html +-# if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__)) +-# define BOOST_HAS_VARIADIC_TMPL +-# else +-# define BOOST_NO_CXX11_VARIADIC_TEMPLATES +-# endif + #endif + + // C++0x features in 4.4.n and later +@@ -176,6 +168,7 @@ + # define BOOST_NO_CXX11_DELETED_FUNCTIONS + # define BOOST_NO_CXX11_TRAILING_RESULT_TYPES + # define BOOST_NO_CXX11_INLINE_NAMESPACES ++# define BOOST_NO_CXX11_VARIADIC_TEMPLATES + #endif + + #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) 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 000000000000..5175800e3f49 --- /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/files/boost-1.58.0-fix-non-constexpr-types-regression.patch b/dev-libs/boost/files/boost-1.58.0-fix-non-constexpr-types-regression.patch new file mode 100644 index 000000000000..da54a48bc32d --- /dev/null +++ b/dev-libs/boost/files/boost-1.58.0-fix-non-constexpr-types-regression.patch @@ -0,0 +1,233 @@ +diff --git a/boost/fusion/adapted/struct/detail/define_struct.hpp b/boost/fusion/adapted/struct/detail/define_struct.hpp +index 2554292..ce3737e 100644 +--- a/boost/fusion/adapted/struct/detail/define_struct.hpp ++++ b/boost/fusion/adapted/struct/detail/define_struct.hpp +@@ -69,7 +69,7 @@ + ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ + template<typename Seq> \ +- BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + self_type& \ + operator=(Seq const& seq) \ + { \ +@@ -128,7 +128,7 @@ + ATTRIBUTE_TUPEL_SIZE, \ + ATTRIBUTES_SEQ) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME() \ + : BOOST_PP_SEQ_FOR_EACH_I_R( \ + 1, \ +@@ -137,7 +137,7 @@ + ATTRIBUTES_SEQ) \ + {} \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(self_type const& other_self) \ + : BOOST_PP_SEQ_FOR_EACH_I_R( \ + 1, \ +@@ -147,7 +147,7 @@ + {} \ + \ + template<typename Seq> \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(Seq const& seq \ + BOOST_PP_IF( \ + BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)), \ +@@ -167,7 +167,7 @@ + #define BOOST_FUSION_DEFINE_STRUCT_CTOR_1( \ + NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + explicit \ + NAME(boost::call_traits< \ + BOOST_PP_TUPLE_ELEM( \ +@@ -180,7 +180,7 @@ + #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_1( \ + TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + explicit \ + NAME(typename boost::call_traits< \ + typename boost::fusion::detail::get_first_arg< \ +@@ -217,7 +217,7 @@ + #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_N( \ + TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(BOOST_PP_SEQ_FOR_EACH_I_R( \ + 1, \ + BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_ARG_I, \ +@@ -245,7 +245,7 @@ + #define BOOST_FUSION_DEFINE_STRUCT_CTOR_N( \ + NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(BOOST_PP_SEQ_FOR_EACH_I_R( \ + 1, \ + BOOST_FUSION_DEFINE_STRUCT_CTOR_ARG_I, \ +diff --git a/boost/fusion/adapted/struct/detail/define_struct_inline.hpp b/boost/fusion/adapted/struct/detail/define_struct_inline.hpp +index a5a3ae0..a037ffe 100644 +--- a/boost/fusion/adapted/struct/detail/define_struct_inline.hpp ++++ b/boost/fusion/adapted/struct/detail/define_struct_inline.hpp +@@ -66,7 +66,7 @@ + #define BOOST_FUSION_IGNORE_2(ARG1, ARG2) + + #define BOOST_FUSION_MAKE_COPY_CONSTRUCTOR(NAME, ATTRIBUTES_SEQ) \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(BOOST_PP_SEQ_FOR_EACH_I( \ + BOOST_FUSION_MAKE_CONST_REF_PARAM, \ + ~, \ +@@ -337,7 +337,7 @@ + typedef boost::mpl::int_<N> index; \ + typedef boost_fusion_detail_Seq sequence_type; \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + BOOST_FUSION_ITERATOR_NAME(NAME)(boost_fusion_detail_Seq& seq) \ + : seq_(seq) \ + BOOST_FUSION_DEFINE_ITERATOR_WKND_INIT_LIST_ENTRIES( \ +diff --git a/libs/fusion/test/sequence/adapt_struct.cpp b/libs/fusion/test/sequence/adapt_struct.cpp +index c0cd304..121827f 100644 +--- a/libs/fusion/test/sequence/adapt_struct.cpp ++++ b/libs/fusion/test/sequence/adapt_struct.cpp +@@ -67,6 +67,17 @@ namespace ns + foo foo_; + int y; + }; ++ ++ ++ // Testing non-constexpr compatible types ++ struct employee { ++ std::string name; ++ std::string nickname; ++ ++ employee(std::string name, std::string nickname) ++ : name(name), nickname(nickname) ++ {} ++ }; + } + + #if BOOST_PP_VARIADICS +@@ -96,6 +107,13 @@ namespace ns + y + ) + ++ BOOST_FUSION_ADAPT_STRUCT( ++ ns::employee, ++ name, ++ nickname ++ ) ++ ++ + #else // BOOST_PP_VARIADICS + + BOOST_FUSION_ADAPT_STRUCT( +@@ -123,6 +141,12 @@ namespace ns + (BOOST_FUSION_ADAPT_AUTO, y) + ) + ++ BOOST_FUSION_ADAPT_STRUCT( ++ ns::employee, ++ (std::string, name) ++ (BOOST_FUSION_ADAPT_AUTO, nickname) ++ ) ++ + #endif + + int +@@ -224,6 +248,15 @@ main() + BOOST_TEST(v2 >= v1); + } + ++ { ++ ns::employee emp("John Doe", "jdoe"); ++ std::cout << at_c<0>(emp) << std::endl; ++ std::cout << at_c<1>(emp) << std::endl; ++ ++ fusion::vector<std::string, std::string> v1("John Doe", "jdoe"); ++ BOOST_TEST(emp == v1); ++ } ++ + return boost::report_errors(); + } + +diff --git a/libs/fusion/test/sequence/define_struct.cpp b/libs/fusion/test/sequence/define_struct.cpp +index 795fdf6..63b5a19 100644 +--- a/libs/fusion/test/sequence/define_struct.cpp ++++ b/libs/fusion/test/sequence/define_struct.cpp +@@ -26,6 +26,14 @@ BOOST_FUSION_DEFINE_STRUCT( + + BOOST_FUSION_DEFINE_STRUCT(BOOST_PP_EMPTY(), s, (int, m)) + ++// Testing non-constexpr compatible types ++BOOST_FUSION_DEFINE_STRUCT( ++ (ns), ++ employee, ++ (std::string, name) ++ (std::string, nickname) ++) ++ + int + main() + { +@@ -100,6 +108,14 @@ main() + BOOST_TEST(p == make_vector(3,5)); + } + ++ { ++ ns::employee emp = make_list("John Doe", "jdoe"); ++ std::cout << at_c<0>(emp) << std::endl; ++ std::cout << at_c<1>(emp) << std::endl; ++ ++ BOOST_TEST(emp == make_vector("John Doe", "jdoe")); ++ } ++ + return boost::report_errors(); + } + +diff --git a/libs/fusion/test/sequence/define_struct_inline.cpp b/libs/fusion/test/sequence/define_struct_inline.cpp +index e849ce9..d34a142 100644 +--- a/libs/fusion/test/sequence/define_struct_inline.cpp ++++ b/libs/fusion/test/sequence/define_struct_inline.cpp +@@ -41,6 +41,13 @@ namespace ns + BOOST_FUSION_DEFINE_STRUCT_INLINE(s, (int, m)) + + BOOST_FUSION_DEFINE_STRUCT_INLINE(empty_struct, ) ++ ++ // Testing non-constexpr compatible types ++ BOOST_FUSION_DEFINE_STRUCT_INLINE( ++ employee, ++ (std::string, name) ++ (std::string, nickname) ++ ) + } + + template <typename Point> +@@ -128,6 +135,17 @@ main() + { + run_test<cls::point>(); // test with non-template enclosing class + run_test<tpl_cls<>::point>(); // test with template enclosing class ++ ++ { ++ using namespace boost::fusion; ++ ++ ns::employee emp = make_list("John Doe", "jdoe"); ++ std::cout << at_c<0>(emp) << std::endl; ++ std::cout << at_c<1>(emp) << std::endl; ++ ++ BOOST_TEST(emp == make_vector("John Doe", "jdoe")); ++ } ++ + return boost::report_errors(); + + } diff --git a/dev-libs/boost/files/remove-toolset-1.48.0.patch b/dev-libs/boost/files/remove-toolset-1.48.0.patch new file mode 100644 index 000000000000..df9152933788 --- /dev/null +++ b/dev-libs/boost/files/remove-toolset-1.48.0.patch @@ -0,0 +1,11 @@ +--- boostcpp.jam ++++ boostcpp.jam +@@ -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) ] ; + } |