[jhbuild] [3.0] libproxy: Install to prefix python lib, not system (GNOME bug 619525)



commit 7cf9f190fc0db10fbf50374b371a5e0e868e6720
Author: Craig Keogh <cskeogh adam com au>
Date:   Thu Jun 10 21:20:02 2010 +0930

    [3.0] libproxy: Install to prefix python lib, not system (GNOME bug 619525)

 modulesets/gnome-external-deps-3.0.modules |    1 +
 patches/libproxy-0.4-python-libdir.patch   |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 728de8b..d5cb523 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -782,6 +782,7 @@
             hash="sha256:17cb515cc6b3bc37f1e5d268068f5220fb1b4398044d9e23cc11e8b36cad470c"
             md5sum="b22c95df70a40949e99add5171fc3084" size="64610">
       <patch file="libproxy-0.4-ldflags.patch" strip="1"/> 
+      <patch file="libproxy-0.4-python-libdir.patch" strip="1"/>
     </branch>
 
     <dependencies>
diff --git a/patches/libproxy-0.4-python-libdir.patch b/patches/libproxy-0.4-python-libdir.patch
new file mode 100644
index 0000000..1b5f28a
--- /dev/null
+++ b/patches/libproxy-0.4-python-libdir.patch
@@ -0,0 +1,17 @@
+diff -upr libproxy-0.4.0.old/bindings/CMakeLists.txt libproxy-0.4.0/bindings/CMakeLists.txt
+--- libproxy-0.4.0.old/bindings/CMakeLists.txt	2010-02-26 06:59:54.000000000 +1030
++++ libproxy-0.4.0/bindings/CMakeLists.txt	2010-06-10 21:10:42.797521284 +0930
+@@ -3,10 +3,10 @@ find_package(PythonInterp)
+ if(PYTHONINTERP_FOUND)
+   execute_process(COMMAND
+                   ${PYTHON_EXECUTABLE}
+-                  -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=1)"
+-                  OUTPUT_VARIABLE pysitepkgdir
++                  -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_version()"
++                  OUTPUT_VARIABLE pyversion
+                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  install(FILES libproxy.py DESTINATION ${pysitepkgdir})
++  install(FILES libproxy.py DESTINATION ${libdir}/python${pyversion}/site-packages)
+ endif()
+ 
+ #TODO c-sharp bindings



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]