On Thu Aug 10, 2017 at 05:26:46PM +0200, David Coppa wrote: > > Hi all, > > Here's the update to the latest CMake. > > As usual, I'd like to have the attached diff tested in a ports bulk > build... > > Thanks! > David
$ make regress 100% tests passed, 0 tests failed out of 451 CMake tests are all green but it breaks my graphics/lensfun build: ===> lensfun-0.3.2p2 depends on: cmake-* -> cmake-3.9.0 ===> lensfun-0.3.2p2 depends on: ninja->=1.5.1 -> ninja-1.7.2p1 ===> lensfun-0.3.2p2 depends on: glib2-* -> glib2-2.52.3 ===> lensfun-0.3.2p2 depends on: png-* -> png-1.6.29 ===> Verifying specs: c glib-2.0 m png c++ c++abi pthread z ===> found c.89.6 glib-2.0.4200.5 m.10.0 png.17.3 c++.0.0 c++abi.0.0 pthread.23.0 z.5.0 ===> Checking files for lensfun-0.3.2p2 `/usr/ports/distfiles/lensfun-0.3.2.tar.gz' is up to date. >> (SHA256) lensfun-0.3.2.tar.gz: OK ===> Extracting for lensfun-0.3.2p2 ===> Patching for lensfun-0.3.2p2 ===> Applying OpenBSD patch patch-cmake_modules_FindGLIB2_cmake Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-cmake_modules_FindGLIB2_cmake,v 1.1 2017/01/31 09:58:35 sthen Exp $ |Avoid messing up between paths found by pkg-config and CMake itself. |--- cmake/modules/FindGLIB2.cmake.orig Sun Nov 15 18:07:26 2015 |+++ cmake/modules/FindGLIB2.cmake Sun Jan 29 10:12:03 2017 -------------------------- Patching file cmake/modules/FindGLIB2.cmake using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 9. Hunk #3 succeeded at 23. Hunk #4 succeeded at 34. Hunk #5 succeeded at 60. done ===> Applying OpenBSD patch patch-docs_CMakeLists_txt Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-docs_CMakeLists_txt,v 1.2 2017/01/31 09:58:35 sthen Exp $ |1. This directory is already covered by BUILD_DOC option, so | no reason to not to add "doc" target in build-by-default list; |2. Actually depend on configured file, CMake already takes care on | depending on source file; |3. No need for GLOB, we can simply use "INSTALL(DIRECTORY foo/" | syntax here. |--- docs/CMakeLists.txt.orig Sun Nov 15 18:07:26 2015 |+++ docs/CMakeLists.txt Sun Jan 29 09:59:09 2017 -------------------------- Patching file docs/CMakeLists.txt using Plan A... Hunk #1 succeeded at 12. done ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ ===> Configuring for lensfun-0.3.2p2 -- The C compiler identification is Clang 4.0.0 -- The CXX compiler identification is Clang 4.0.0 -- Check for working C compiler: /usr/ports/pobj/lensfun-0.3.2/bin/cc -- Check for working C compiler: /usr/ports/pobj/lensfun-0.3.2/bin/cc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Detecting C compile features -- Detecting C compile features - done -- Check for working CXX compiler: /usr/ports/pobj/lensfun-0.3.2/bin/c++ -- Check for working CXX compiler: /usr/ports/pobj/lensfun-0.3.2/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- Looking for include file regex.h -- Looking for include file regex.h - found -- Looking for include file endian.h -- Looking for include file endian.h - found -- Found PkgConfig: /usr/bin/pkg-config (found version "0.27.1") -- Checking for one of the modules 'glib-2.0' -- Could NOT find OpenMP_C (missing: OpenMP_C_FLAGS OpenMP_C_LIB_NAMES) (found version "1.0") -- Could NOT find OpenMP_CXX (missing: OpenMP_CXX_FLAGS OpenMP_CXX_LIB_NAMES) (found version "1.0") -- Found PythonInterp: /usr/local/bin/python (found version "2.7.13") -- Found ZLIB: /usr/lib/libz.so.5.0 (found version "1.2.3") -- Found PNG: /usr/local/lib/libpng.so.17.3 (found version "1.6.29") -- ------------------------------------------------------------------------------------- -- Building Lensfun 0.3.2.0 -- ------------------------------------------------------------------------------------- -- Build as dynamic/shared library -- Build type: Release -- Build doc: No -- Build test suite: Yes -- Build lenstool: Yes -- Build with support for SSE: ON -- Build with support for SSE2: ON -- Install helper scripts: ON -- Install prefix: /usr/local -- Using: -- GLIB2 include dir: /usr/local/lib/glib-2.0/include;/usr/local/include/glib-2.0 -- GLIB2 library: /usr/local/lib/libglib-2.0.so.4200.5 -- Configuring done -- Generating done -- Build files have been written to: /usr/ports/pobj/lensfun-0.3.2/build-amd64 ===> Building for lensfun-0.3.2p2 [1/32] /usr/ports/pobj/lensfun-0.3.2/bin/c++ -Dlensfun_EXPORTS -I. -I/usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/include/lensfun -isystem /usr/local/lib/glib-2.0/include -isystem /usr/local/include/glib-2.0 -O2 -pipe -DNDEBUG -fPIC -DCONF_SYMBOL_VISIBILITY -MD -MT libs/lensfun/CMakeFiles/lensfun.dir/mod-color.cpp.o -MF libs/lensfun/CMakeFiles/lensfun.dir/mod-color.cpp.o.d -o libs/lensfun/CMakeFiles/lensfun.dir/mod-color.cpp.o -c /usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/libs/lensfun/mod-color.cpp [2/32] /usr/ports/pobj/lensfun-0.3.2/bin/c++ -I. -I/usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/include/lensfun -isystem /usr/local/lib/glib-2.0/include -isystem /usr/local/include/glib-2.0 -O2 -pipe NOTFOUND -DNDEBUG -MD -MT tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -MF tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o.d -o tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -c /usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/tests/test_modifier.cpp FAILED: tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o /usr/ports/pobj/lensfun-0.3.2/bin/c++ -I. -I/usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/include/lensfun -isystem /usr/local/lib/glib-2.0/include -isystem /usr/local/include/glib-2.0 -O2 -pipe NOTFOUND -DNDEBUG -MD -MT tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -MF tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o.d -o tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -c /usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/tests/test_modifier.cpp c++: error: no such file or directory: 'NOTFOUND' ninja: build stopped: subcommand failed. *** Error 1 in . (/usr/ports/devel/cmake/cmake.port.mk:31 'do-build': @cd /usr/ports/pobj/lensfun-0.3.2/build-amd64 && exec /usr/bin/env -i ...) *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2701 '/usr/ports/pobj/lensfun-0.3.2/build-amd64/.build_done') *** Error 1 in /usr/ports/graphics/lensfun (/usr/ports/infrastructure/mk/bsd.port.mk:2408 'all')
