View | Details | Raw Unified | Return to bug 156901 | Differences between
and this patch

Collapse All | Expand All

(-)graphics/opencv/Makefile (-1 / +1 lines)
Lines 35-41 Link Here
35 
.if !defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
 35 
.if !defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
36 
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-opencv
 36 
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-opencv
37 
LIB_DEPENDS+=	opencv_core.2:${PORTSDIR}/graphics/opencv-core
 37 
LIB_DEPENDS+=	opencv_core.2:${PORTSDIR}/graphics/opencv-core
38 
CMAKE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 38 
CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
39 

          39
          

        

        

          40
          
PORTDOCS=	*

          40
          
PORTDOCS=	*

        

        

          41
          

          41
          

        



(-)graphics/opencv/files/patch-CMakeLists.txt
      (+17 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- CMakeLists.txt.orig	2011-09-02 23:11:27.000000000 +0200

            

            

              2
              
+++ CMakeLists.txt	2011-09-02 23:12:10.000000000 +0200

            

            

              3
              
@@ -256,11 +256,12 @@

            

            

              4
              
 # Detect GNU version:

            

            

              5
              
 # ----------------------------------------------------------------------------

            

            

              6
              
 if(CMAKE_COMPILER_IS_GNUCXX)

            

            

              7
              
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version

            

            

              8
              
+    string(REGEX REPLACE "[ 	]+" ";" _CMAKE_CXX_COMPILER_ARG1 "${CMAKE_CXX_COMPILER_ARG1}")

            

            

              9
              
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${_CMAKE_CXX_COMPILER_ARG1} --version

            

            

              10
              
                   OUTPUT_VARIABLE CMAKE_OPENCV_GCC_VERSION_FULL

            

            

              11
              
                   OUTPUT_STRIP_TRAILING_WHITESPACE)

            

            

              12
              
     

            

            

              13
              
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -v

            

            

              14
              
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${_CMAKE_CXX_COMPILER_ARG1} -v

            

            

              15
              
                   ERROR_VARIABLE CMAKE_OPENCV_GCC_INFO_FULL

            

            

              16
              
                   OUTPUT_STRIP_TRAILING_WHITESPACE)           

            

            

              17
              
         

            



(-)graphics/opencv/files/patch-OpenCVPCHSupport.cmake
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- OpenCVPCHSupport.cmake.orig	2011-09-02 23:57:12.000000000 +0200

            

            

              2
              
+++ OpenCVPCHSupport.cmake	2011-09-02 23:56:55.000000000 +0200

            

            

              3
              
@@ -100,7 +100,7 @@

            

            

              4
              
     IF(CMAKE_COMPILER_IS_GNUCXX)

            

            

              5
              
         IF(CMAKE_CXX_COMPILER_ARG1)

            

            

              6
              
             # remove leading space in compiler argument

            

            

              7
              
-            STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1})

            

            

              8
              
+            STRING(REGEX REPLACE "[ 	]+" ";" pchsupport_compiler_cxx_arg1 "${CMAKE_CXX_COMPILER_ARG1}")

            

            

              9
              
 

            

            

              10
              
             SET(${out_command}

            

            

              11
              
               ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}

            






  

  Return to bug 156901