diff options
| author |   Nicholas Fish <gentoo@seaofdirac.net> | 2016-01-26 20:13:00 +0100 |
|---|---|---|
| committer | Nicholas Fish <gentoo@seaofdirac.net> | 2016-01-26 20:13:00 +0100 |
| commit | c5a83124f41864a51f51b810d475b497babdab58 (patch) | |
| tree | dffbe1994f6e6182e42fb1cc92bcf0aeb3e479fb /dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch | |
| parent | Add thunderbird-44.0b1 ebuild working on musl (diff) | |
| parent | Add dev-libs/boost for LibreSSL >= 2.3.0 (diff) | |
| download | ennui-c5a83124f41864a51f51b810d475b497babdab58.tar.gz ennui-c5a83124f41864a51f51b810d475b497babdab58.tar.bz2 ennui-c5a83124f41864a51f51b810d475b497babdab58.zip | |
Subtree merge in boost from csmk's fork of LibreSSL overlay (https://github.com/csmk/libressl/commit/095bc1fb484363d00f763c918df17a2a0ee358d3)
Diffstat (limited to 'dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch')
| -rw-r--r-- | dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch new file mode 100644 index 0000000..c24a56c --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch @@ -0,0 +1,62 @@ +--- libs/python/build/Jamfile.v2 ++++ libs/python/build/Jamfile.v2 +@@ -39,23 +39,6 @@ + PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ; + } + +- +-rule find-py3-version +-{ +- local versions = [ feature.values python ] ; +- local py3ver ; +- for local v in $(versions) +- { +- if $(v) >= 3.0 +- { +- py3ver = $(v) ; +- } +- } +- return $(py3ver) ; +-} +- +-py3-version = [ find-py3-version ] ; +- + project boost/python + : source-location ../src + : requirements +@@ -82,7 +65,7 @@ + rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } + rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } + +-rule lib_boost_python ( is-py3 ? ) ++rule lib_boost_python + { + + local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; +@@ -91,7 +74,7 @@ + { + python2 = true ; + } +- lib [ cond $(is-py3) : boost_python3 : boost_python ] ++ lib boost_python + : # sources + numeric.cpp + list.cpp +@@ -148,7 +131,6 @@ + <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 ; +-} |