packages: opencv/opencv-multilib.patch - restored, upstream does not suppor...

lisu lisu at pld-linux.org
Wed Sep 21 09:39:42 CEST 2011


Author: lisu                         Date: Wed Sep 21 07:39:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restored, upstream does not support lib64 for python

---- Files affected:
packages/opencv:
   opencv-multilib.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/opencv/opencv-multilib.patch
diff -u /dev/null packages/opencv/opencv-multilib.patch:1.3
--- /dev/null	Wed Sep 21 09:39:42 2011
+++ packages/opencv/opencv-multilib.patch	Wed Sep 21 09:39:37 2011
@@ -0,0 +1,14 @@
+--- OpenCV-2.3.1/CMakeLists.txt~	2011-09-20 16:37:58.864889717 +0200
++++ OpenCV-2.3.1/CMakeLists.txt	2011-09-21 09:33:29.341296893 +0200
+@@ -666,9 +666,9 @@
+                     OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
+                     OUTPUT_STRIP_TRAILING_WHITESPACE)
+     if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
++	set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+     else() #debian based assumed, install to the dist-packages.
+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
++	set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
+     endif()
+ endif()
+ if(CMAKE_HOST_WIN32)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv-multilib.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list