From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Mon, 6 Jan 2020 14:55:34 +0100 From: Michael Olbrich Message-ID: <20200106135534.GK5858@pengutronix.de> References: <20200102135503.9854-1-m.cichy@pengutronix.de> <20200102135503.9854-3-m.cichy@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200102135503.9854-3-m.cichy@pengutronix.de> Subject: Re: [ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: m.cichy@pengutronix.de So, configure_helper and cmake is a bit tricky. We have no way to actually get only the options that can actually be set externally so just blindly adding all options here is not possible. So you need review the options manually. configure_helper is still useful here because it can also compare two different versions during a version bump, so you only need to check any new options then. So I'm commenting all the stuff that I can see with a quick review, but please also check all the other options to verify that the actually change something. On Thu, Jan 02, 2020 at 02:55:00PM +0100, Marian Cichy wrote: > Signed-off-by: Marian Cichy > --- > rules/opencv.make | 182 +++++++++++++++++++++++++++++++++------------- > 1 file changed, 133 insertions(+), 49 deletions(-) > > diff --git a/rules/opencv.make b/rules/opencv.make > index fc6243753..1656f605a 100644 > --- a/rules/opencv.make > +++ b/rules/opencv.make > @@ -27,7 +27,7 @@ OPENCV_URL := \ > OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) > OPENCV_DIR := $(BUILDDIR)/$(OPENCV) > OPENCV_LICENSE := BSD > - > +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build > # ---------------------------------------------------------------------------- > # Prepare > # ---------------------------------------------------------------------------- > @@ -37,94 +37,178 @@ OPENCV_CONF_TOOL := cmake > OPENCV_CONF_OPT := \ > $(CROSS_CMAKE_USR) \ > -DANT_EXECUTABLE:FILEPATH= \ > - -DPYTHON_EXECUTABLE= \ > + -DAtlas_BLAS_LIBRARY=Atlas_BLAS_LIBRARY-NOTFOUND \ > + -DAtlas_CBLAS_LIBRARY=Atlas_CBLAS_LIBRARY-NOTFOUND \ > + -DAtlas_LAPACK_LIBRARY=Atlas_LAPACK_LIBRARY-NOTFOUND \ Just skip the NOTFOUND stuff here. It's ok if the configure_helper has some remaining output. > + -DBUILD_CUDA_STUBS:BOOL=OFF \ > -DBUILD_DOCS:BOOL=OFF \ > -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ > + -DBUILD_ITT=ON \ > + -DBUILD_JASPER=OFF \ > + -DBUILD_JAVA=OFF \ > + -DBUILD_JPEG=OFF \ > + -DBUILD_LIST= \ > + -DBUILD_OPENEXR=OFF \ > -DBUILD_PACKAGE:BOOL=OFF \ > - -DCMAKE_BUILD_TYPE=Release \ > + -DBUILD_PERF_TESTS=OFF \ > + -DBUILD_PNG=OFF \ This is strange. PNG support is enabled below. > + -DBUILD_PROTOBUF=ON \ > -DBUILD_SHARED_LIBS:BOOL=ON \ > + -DBUILD_TBB=OFF \ > -DBUILD_TESTS=OFF \ > - -DBUILD_PERF_TESTS=OFF \ > + -DBUILD_TIFF=OFF \ > + -DBUILD_USE_SYMLINKS=OFF \ > + -DBUILD_WEBP=OFF \ > -DBUILD_WITH_DEBUG_INFO=OFF \ > - -DBUILD_CUDA_STUBS:BOOL=OFF \ > - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ > - -DCMAKE_SKIP_RPATH=OFF \ > - -DCMAKE_USE_RELATIVE_PATHS=OFF \ > + -DBUILD_WITH_DYNAMIC_IPP=OFF \ > + -DBUILD_ZLIB=OFF \ zlib is selected? > + -DBUILD_opencv_apps:BOOL=OFF \ > + -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ > + -DBUILD_opencv_core:BOOL=ON \ > + -DBUILD_opencv_dnn=OFF \ > + -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ > + -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ > + -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ > + -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ > + -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ > + -DBUILD_opencv_java_bindings_generator=ON \ > + -DBUILD_opencv_js=OFF \ > + -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ > + -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ > + -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ > + -DBUILD_opencv_python_bindings_generator=ON \ > + -DBUILD_opencv_python_tests=ON \ > + -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ > + -DBUILD_opencv_ts:BOOL=OFF \ > + -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ > + -DBUILD_opencv_videoio=ON \ > + -DBUILD_opencv_world:BOOL=OFF \ > + -DCAROTENE_NS=carotene_o4t \ > + -DCMAKE_CONFIGURATION_TYPES="Debug;Release" \ I think, that's just some internal stuff, and can be dropped. > + -DCPU_BASELINE=DETECT \ > + -DCPU_BASELINE_DISABLE=";VFPV3" \ > + -DCPU_BASELINE_REQUIRE=";NEON" \ No, that's platform specific and detected. > + -DCPU_DISPATCH= \ > + -DCV_DISABLE_OPTIMIZATION=OFF \ > + -DCV_ENABLE_INTRINSICS=ON \ > + -DCV_TRACE=ON \ > + -DENABLE_BUILD_HARDENING=OFF \ > + -DENABLE_CCACHE=OFF \ > + -DENABLE_CONFIG_VERIFICATION=OFF \ > + -DENABLE_COVERAGE=OFF \ > -DENABLE_FAST_MATH=ON \ > + -DENABLE_GNU_STL_DEBUG=OFF \ > + -DENABLE_IMPL_COLLECTION=OFF \ > + -DENABLE_INSTRUMENTATION=OFF \ > + -DENABLE_LTO=OFF \ > + -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ > -DENABLE_NOISY_WARNINGS=OFF \ > -DENABLE_OMIT_FRAME_POINTER=ON \ > - -DENABLE_PRECOMPILED_HEADERS=OFF \ > + -DENABLE_PIC=ON \ > -DENABLE_PROFILING=OFF \ > -DENABLE_SOLUTION_FOLDERS=OFF \ > - -DWITH_GTK:BOOL=OFF \ > - -DWITH_TBB:BOOL=OFF \ > - -DWITH_TIFF:BOOL=OFF \ > - -DWITH_CUDA:BOOL=OFF \ > - -DWITH_EIGEN:BOOL=OFF \ > - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ > -DENABLE_VFPV3:BOOL=OFF \ > - -DWITH_GIGEAPI:BOOL=OFF \ > + -DEXECUTABLE_OUTPUT_PATH=$(OPENCV_BUILD_DIR)/bin \ When are the files copied there? Maybe OPENCV_PKGDIR/... makes sense here? > + -DGENERATE_ABI_DESCRIPTOR=OFF \ > -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ > -DINSTALL_C_EXAMPLES:BOOL=OFF \ > -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ > + -DINSTALL_TESTS=OFF \ > -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ > + -DLAPACK_CBLAS_H= \ > + -DLAPACK_IMPL=Unknown \ > + -DLAPACK_LAPACKE_H= \ > + -DLAPACK_LIBRARIES= \ I'm pretty sure that's internal stuff. I'm guessing it cannot be overwritten anyways. > + -DMKL_INCLUDE_DIRS=MKL_ROOT_DIR-NOTFOUND/include \ drop. > + -DMKL_WITH_OPENMP=OFF \ > + -DMKL_WITH_TBB=OFF \ > + -DOPENCL_FOUND=ON \ I thinks that not changeable. > + -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \ This is suspicious. Is something downloaded while building? That should not happen. > + -DOPENCV_DUMP_HOOKS_FLOW=OFF \ > + -DOPENCV_ENABLE_MEMALIGN=ON \ > + -DOPENCV_ENABLE_MEMORY_SANITIZER=OFF \ > + -DOPENCV_ENABLE_NONFREE=OFF \ > -DOPENCV_EXTRA_MODULES_PATH:PATH= \ > + -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ > + -DOPENCV_GENERATE_PKGCONFIG=OFF \ I thinks that should be enabled. > + -DOPENCV_GENERATE_SETUPVARS=ON \ > + -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \ No, this should not be set. > + -DOPENCV_PYTHON3_VERSION=OFF \ > -DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \ > - -DWITH_OPENEXR:BOOL=OFF \ > - -DWITH_PVAPI:BOOL=OFF \ > + -DPROTOBUF_UPDATE_FILES=OFF \ > + -DPYTHON2_EXECUTABLE= \ > + -DPYTHON2_INCLUDE_DIR2= \ > + -DPYTHON2_LIBRARY= \ > + -DPYTHON2_LIBRARY_DEBUG= \ > + -DPYTHON2_NUMPY_INCLUDE_DIRS= \ > + -DPYTHON2_PACKAGES_PATH= \ > + -DPYTHON3_EXECUTABLE=/usr/bin/python3 \ > + -DPYTHON3_INCLUDE_DIR2= \ > + -DPYTHON3_LIBRARY= \ > + -DPYTHON3_LIBRARY_DEBUG= \ > + -DPYTHON3_NUMPY_INCLUDE_DIRS= \ > + -DPYTHON3_PACKAGES_PATH=lib/python3.7/dist-packages \ We're not selecting anything python related. So this should all be disabled. Check which options are configurable. Michael > -DWITH_1394:BOOL=OFF \ > - -DWITH_VTK:BOOL=OFF \ > + -DWITH_ADE=ON \ > + -DWITH_ARAVIS=OFF \ > + -DWITH_CAROTENE=ON \ > + -DWITH_CLP=OFF \ > -DWITH_CUBLAS:BOOL=OFF \ > -DWITH_CUDA:BOOL=OFF \ > -DWITH_CUFFT:BOOL=OFF \ > - -DWITH_NVCUVID:BOOL=OFF \ > -DWITH_EIGEN:BOOL=OFF \ > -DWITH_FFMPEG:BOOL=OFF \ > + -DWITH_GDAL:BOOL=OFF \ > + -DWITH_GDCM=OFF \ > + -DWITH_GIGEAPI:BOOL=OFF \ > + -DWITH_GPHOTO2:BOOL=OFF \ > + -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \ > + -DWITH_GTK:BOOL=OFF \ > + -DWITH_GTK_2_X=OFF \ > + -DWITH_HALIDE=OFF \ > + -DWITH_HPX=OFF \ > + -DWITH_IMGCODEC_HDR=ON \ > + -DWITH_IMGCODEC_PFM=ON \ > + -DWITH_IMGCODEC_PXM=ON \ > + -DWITH_IMGCODEC_SUNRASTER=ON \ > + -DWITH_INF_ENGINE=OFF \ > + -DWITH_IPP_A:BOOL=OFF \ > + -DWITH_ITT=ON \ > -DWITH_JASPER:BOOL=OFF \ > -DWITH_JPEG:BOOL=ON \ > - -DWITH_WEBP:BOOL=OFF \ > - -DWITH_PNG:BOOL=ON \ > + -DWITH_LAPACK=ON \ > + -DWITH_LIBREALSENSE=OFF \ > + -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \ > + -DWITH_MFX=OFF \ > + -DWITH_NVCUVID:BOOL=OFF \ > -DWITH_OPENCL:BOOL=ON \ > - -DWITH_OPENCL_SVM:BOOL=OFF \ > -DWITH_OPENCLAMDBLAS:BOOL=OFF \ > -DWITH_OPENCLAMDFFT:BOOL=OFF \ > + -DWITH_OPENCL_SVM:BOOL=OFF \ > -DWITH_OPENEXR:BOOL=OFF \ > + -DWITH_OPENGL:BOOL=OFF \ > -DWITH_OPENMP:BOOL=OFF \ > - -DWITH_PTHREADS_PF:BOOL=OFF \ > -DWITH_OPENNI:BOOL=OFF \ > -DWITH_OPENNI2:BOOL=OFF \ > + -DWITH_OPENVX=OFF \ > + -DWITH_PNG:BOOL=ON \ > + -DWITH_PROTOBUF=ON \ > + -DWITH_PTHREADS_PF:BOOL=OFF \ > -DWITH_PVAPI:BOOL=OFF \ > + -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \ > + -DWITH_QUIRC=ON \ > -DWITH_TBB:BOOL=OFF \ > + -DWITH_TIFF:BOOL=OFF \ > -DWITH_UNICAP:BOOL=OFF \ > + -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \ > + -DWITH_VA=OFF \ > + -DWITH_VA_INTEL=OFF \ > + -DWITH_VULKAN=OFF \ > + -DWITH_WEBP:BOOL=OFF \ > -DWITH_XIMEA:BOOL=OFF \ > -DWITH_XINE:BOOL=OFF \ > - -DWITH_CLP:BOOL=OFF \ > - -DWITH_IPP_A:BOOL=OFF \ > - -DWITH_GDAL:BOOL=OFF \ > - -DWITH_GPHOTO2:BOOL=OFF \ > - -DBUILD_opencv_apps:BOOL=OFF \ > - -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ > - -DBUILD_opencv_core:BOOL=ON \ > - -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ > - -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ > - -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ > - -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ > - -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ > - -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ > - -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ > - -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ > - -DBUILD_opencv_ts:BOOL=OFF \ > - -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ > - -DBUILD_opencv_world:BOOL=OFF \ > - -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \ > - -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \ > - -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \ > - -DWITH_OPENGL:BOOL=OFF \ > - -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) > > > -OPENCV_BUILD_DIR := $(OPENCV_DIR)-build > - > $(STATEDIR)/opencv.install: > > > -- > 2.20.1 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de