diff options
Diffstat (limited to 'media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch')
-rw-r--r-- | media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch b/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch deleted file mode 100644 index 6481ee8..0000000 --- a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN OpenCV-2.3.1-2-options/CMakeLists.txt OpenCV-2.3.1-3-suffix/CMakeLists.txt ---- OpenCV-2.3.1-2-options/CMakeLists.txt 2011-11-13 14:11:45.000000000 +0100 -+++ OpenCV-2.3.1-3-suffix/CMakeLists.txt 2011-11-13 14:33:26.000000000 +0100 -@@ -18,7 +18,7 @@ - # Add these standard paths to the search paths for FIND_LIBRARY - # to find libraries from these locations first - if(UNIX) -- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib) -+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX}) - endif() - - # it _must_ go before PROJECT(OpenCV) in order to work -@@ -117,7 +117,7 @@ - - # SUBDIRECTORIES: - # Save libs and executables in the same place --set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries" ) -+set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE PATH "Output directory for libraries" ) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" ) - - if(ANDROID OR WIN32) -@@ -665,9 +665,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) |