diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2011-11-07 17:31:40 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2011-11-07 17:31:40 +0000 |
| commit | f19bc634793196d87226f1cf1f7a8bf84934bd03 (patch) | |
| tree | 7c378fb2b00fc2680b5432f9bef6cf79c056ffab /app-emulation/xen-tools/files | |
| parent | more fixes for the gnu patch (diff) | |
| download | gentoo-2-f19bc634793196d87226f1cf1f7a8bf84934bd03.tar.gz gentoo-2-f19bc634793196d87226f1cf1f7a8bf84934bd03.tar.bz2 gentoo-2-f19bc634793196d87226f1cf1f7a8bf84934bd03.zip | |
Fix to pyxml, add dep pypam, fixes Bug 367735, patch by Arfrever, repair to curl patch, Bug #386487, repiared by Ian Delaney aka idella4
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/xen-tools/files')
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch | 6 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch index f9d6d5ac40b0..c3fd9138699f 100644 --- a/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch +++ b/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch @@ -1,10 +1,10 @@ diff -ur xen-4.1.1.orig//tools/check/check_curl xen-4.1.1/tools/check/check_curl --- xen-4.1.1.orig//tools/check/check_curl 2011-06-15 00:03:44.000000000 +0800 +++ xen-4.1.1/tools/check/check_curl 2011-10-14 00:42:08.189717078 +0800 -@@ -9,5 +9,5 @@ +@@ -9,5 +9,6 @@ fi has_or_fail curl-config --curl_libs=`curl-config --libs` || fail "curl-config --libs failed" -+curl_libs=`echo $curl_libs |sed -e 's/-W[^[:space:]]*[[:space:]]//'` || fail "curl-config --libs failed" + curl_libs=`curl-config --libs` || fail "curl-config --libs failed" ++curl_libs=`echo $curl_libs | sed -re 's/-(W|march|mtune|pipe)[^[:space:]]*[[:space:]]//g'` || fail "curl-config --libs failed" test_link $curl_libs || fail "dependency libraries for curl are missing" diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch b/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch new file mode 100644 index 000000000000..099d1f6913aa --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch @@ -0,0 +1,18 @@ +--- xml/__init__.py ++++ xml/__init__.py +@@ -21,12 +21,14 @@ + + _MINIMUM_XMLPLUS_VERSION = (0, 8, 4) + ++import pprint ++import sys + + def use_pyxml(): ++ pprint.pprint(sys.modules) + import _xmlplus + v = _xmlplus.version_info + if v >= _MINIMUM_XMLPLUS_VERSION: +- import sys + _xmlplus.__path__.extend(__path__) + sys.modules[__name__] = _xmlplus + modules = [] |