diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-01-19 22:40:07 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-01-19 22:40:07 +0000 |
| commit | 9d5e5366e2174ec6465be4daf97db35914672ace (patch) | |
| tree | cb6211009f380e9d44c6d796c8ad966b29a7c625 /dev-util/boost-build/files | |
| parent | Stable for AMD64, wrt security bug #399409 (diff) | |
| download | gentoo-2-9d5e5366e2174ec6465be4daf97db35914672ace.tar.gz gentoo-2-9d5e5366e2174ec6465be4daf97db35914672ace.tar.bz2 gentoo-2-9d5e5366e2174ec6465be4daf97db35914672ace.zip | |
Remove directory from rpath, initial support for dots in --python-buildid option. Patch by Arfrever
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/boost-build/files')
| -rw-r--r-- | dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch | 11 | ||||
| -rw-r--r-- | dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch | 19 |
2 files changed, 30 insertions, 0 deletions
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch new file mode 100644 index 000000000000..8b88b43f3d2f --- /dev/null +++ b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch @@ -0,0 +1,11 @@ +--- tools/python.jam ++++ tools/python.jam +@@ -961,7 +961,7 @@ + # linux). + : $(usage-requirements) + <testing.launcher>$(set-PYTHONPATH) +- <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib ++ <library-path>$(libraries) <library>python.lib + ; + } + diff --git a/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch new file mode 100644 index 000000000000..b3bee03b56f3 --- /dev/null +++ b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch @@ -0,0 +1,19 @@ +--- tools/common.jam ++++ tools/common.jam +@@ -759,7 +759,15 @@ + switch $(f:G) + { + case <base> : +- result += $(name:B) ; ++ local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ; ++ if $(matched) = boost_python || $(matched) = boost_mpi_python ++ { ++ result += $(name) ; ++ } ++ else ++ { ++ result += $(name:B) ; ++ } + + case <toolset> : + result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : |